projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdd9e9a 3210bda)
Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 10 Nov 2014 17:10:09 +0000 (17:10 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 10 Nov 2014 17:10:09 +0000 (17:10 +0000)
Conflicts:
NEWS


Trivial merge
Domain: System / IPC;