projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79c150c 1d560ff)
Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 24 Apr 2013 19:31:28 +0000 (20:31 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 24 Apr 2013 19:31:28 +0000 (20:31 +0100)
Conflicts:
NEWS
configure.ac


Trivial merge
Domain: System / IPC;