diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-01 12:19:02 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-01 12:19:02 +0100 |
| commit | a31ac98f18eaaadf2098e911388b11aa24d46fa7 (patch) | |
| tree | 81a491221adbd0db84dbe6f263474e1b78910a74 | |
| parent | b1e28fba0bcbd62d3cfbd6ce861de036d9d0537a (diff) | |
| parent | b0503e03fd0c0959865f4d9a39cce26e7d079fb0 (diff) | |
| download | dbus-a31ac98f18eaaadf2098e911388b11aa24d46fa7.tar.gz | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
configure.ac
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -D-Bus 1.5.2 (UNRELEASED) +D-Bus 1.5.2 (2011-06-01) == Notes for distributors: diff --git a/configure.ac b/configure.ac index c43fe733..860667a3 100644 --- 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], [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 |