Merge branch 'dbus-1.2'

Conflicts:
	dbus/dbus-sysdeps-util-unix.c
This commit is contained in:
Thiago Macieira 2009-05-13 15:52:18 +02:00
commit e21d06cba4

View file

@ -3,7 +3,7 @@ AC_PREREQ(2.52)
m4_define([dbus_major_version], [1])
m4_define([dbus_minor_version], [2])
m4_define([dbus_micro_version], [13])
m4_define([dbus_micro_version], [14])
m4_define([dbus_version],
[dbus_major_version.dbus_minor_version.dbus_micro_version])
AC_INIT(dbus, [dbus_version])