]> git.ipfire.org Git - thirdparty/dbus.git/commit
Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 4 Oct 2012 07:54:58 +0000 (08:54 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 4 Oct 2012 07:54:58 +0000 (08:54 +0100)
commit9fafead23d5a8f66ea65c36b450017b10cf8b5fb
tree5fb4993e3b45eeb31a868e3eb3d6d9892f5766ae
parentc7495461fe6b48b4070452ed8640fbc4888f1210
parent62aec8838a2d3841c5f1377c6eef429a7df84aed
Merge branch 'dbus-1.6'

Conflicts:
NEWS
bus/activation-helper.c
configure.ac
NEWS