]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
projects / thirdparty / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 039758c 5ad2668)
Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 22 Aug 2013 17:03:59 +0000 (18:03 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 22 Aug 2013 17:03:59 +0000 (18:03 +0100)
Conflicts:
NEWS


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