]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
projects / thirdparty / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26cc04e 88f5a6e)
Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Feb 2012 17:36:51 +0000 (17:36 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Feb 2012 17:36:51 +0000 (17:36 +0000)
Conflicts:
NEWS
configure.ac


Trivial merge
Mirror of https://gitlab.freedesktop.org/dbus/dbus.git