diff options
| author | Thiago Macieira <thiago@kde.org> | 2009-05-13 15:52:18 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2009-05-13 15:52:18 +0200 |
| commit | e21d06cba4cb5c5e3e201a54336e9df3c24a1c21 (patch) | |
| tree | 80b971490b3e688ddc4be4eb0bf5855adb75bf73 | |
| parent | 63196f69c420f55fbb1fa76adaa41877f7f06d7b (diff) | |
| parent | f76d17437ee95bb2621cb55c79707b9f01dcf89a (diff) | |
Merge branch 'dbus-1.2'
Conflicts:
dbus/dbus-sysdeps-util-unix.c
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index c1eabf0c..6992487b 100644 --- a/configure.in +++ b/configure.in @@ -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]) |