projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d8895e ad5b312)
Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 5 Sep 2013 12:12:36 +0000 (13:12 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 5 Sep 2013 12:12:36 +0000 (13:12 +0100)
Conflicts:
NEWS
tools/run-with-tmp-session-bus.sh


Trivial merge
Domain: System / IPC;