Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 10 Jun 2011 17:52:07 +0000 (18:52 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 10 Jun 2011 17:52:07 +0000 (18:52 +0100)
commitc83287898cc99d9dee75cf4211341be46b1ea39f
tree9fa61b30a919c67997b22dbbe698948b138dd70f
parent963a38d0b1eb17abadc5e83028f861b1c2be8d8a
parent5b68cf3ed9c7b655a6d4e971d17ffa8924c3fadc
Merge branch 'dbus-1.4'
NEWS
cmake/CMakeLists.txt
configure.ac
dbus/dbus-connection.c