about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-11-12 01:36:16 +0100
committerMichael Biebl <biebl@debian.org>2011-11-12 01:36:16 +0100
commit86f44a65ad7617c7445edeca287fd903fc491a15 (patch)
treef50b2eccd9e376fead6b1a8c9e8cf7604a862e0c /include
parentd35bb563359e30a95af10733a424643f1b8e6edb (diff)
parentb436a68a20ff3114ded32a7a3d70cdd4954039f9 (diff)
Merge commit 'upstream/0.9.2.0'
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.in2
-rw-r--r--include/nm-version.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/Makefile.in b/include/Makefile.in
index 27d7ad02..e10ca22c 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -142,6 +142,8 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GUDEV_CFLAGS = @GUDEV_CFLAGS@
diff --git a/include/nm-version.h b/include/nm-version.h
index b893219d..b7b6ca2e 100644
--- a/include/nm-version.h
+++ b/include/nm-version.h
@@ -43,7 +43,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (1)
+#define NM_MICRO_VERSION (2)
 
 /**
  * NM_CHECK_VERSION: