summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-07-29 14:28:54 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-07-29 14:28:54 +0100
commit7c15271a17860836b30020242fd960420afc088f (patch)
tree25041ce6a964d0cac3ba535e764c53b1a4134401
parentbae9bb547f0ccee9b84d1bdef8f21b096d219756 (diff)
-rw-r--r--NEWS4
-rw-r--r--configure.ac2
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index efe14a87..fec6bd6e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-D-Bus 1.4.14 (UNRELEASED)
+D-Bus 1.4.14 (2011-07-29)
==
+The "Puny receptacle!" release.
+
Changes:
• Use DBUS_ERROR_OBJECT_PATH_IN_USE if dbus_connection_try_register_object_path
diff --git a/configure.ac b/configure.ac
index a6c8d741..539213f3 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], [4])
-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],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus])