projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d97e8f9 a559ed3)
Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 5 Jan 2015 15:00:45 +0000 (15:00 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 5 Jan 2015 15:00:45 +0000 (15:00 +0000)
Conflicts:
NEWS
configure.ac


Trivial merge
Domain: System / IPC;