Commit a31ac98f authored by Simon McVittie's avatar Simon McVittie

Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	configure.ac
parents b1e28fba b0503e03
D-Bus 1.5.2 (UNRELEASED)
D-Bus 1.5.2 (2011-06-01)
==
Notes for distributors:
......
......@@ -3,7 +3,7 @@ AC_PREREQ([2.63])
m4_define([dbus_major_version], [1])
m4_define([dbus_minor_version], [5])
m4_define([dbus_micro_version], [1])
m4_define([dbus_micro_version], [2])
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])
......@@ -36,7 +36,7 @@ LT_CURRENT=9
## increment any time the source changes; set to
## 0 if you increment CURRENT
LT_REVISION=0
LT_REVISION=1
## increment if any interfaces have been added; set to 0
## if any interfaces have been changed or removed. removal has
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment