Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac

diff --git a/NEWS b/NEWS
index 2a8f8ed..3dd3c2d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-D-Bus 1.6.2 (UNRELEASED)
+D-Bus 1.7.0 (UNRELEASED)
 ==
 
 Fixes:

diff --git a/configure.ac b/configure.ac
index 837e7b2..6c494f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.63])
 
 m4_define([dbus_major_version], [1])
 m4_define([dbus_minor_version], [6])
-m4_define([dbus_micro_version], [1])
+m4_define([dbus_micro_version], [999])
 m4_define([dbus_version],
           [dbus_major_version.dbus_minor_version.dbus_micro_version])
 AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus])