projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe5b9d3 2dfee73)
Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 29 Jul 2011 15:28:32 +0000 (16:28 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 29 Jul 2011 15:28:32 +0000 (16:28 +0100)
Conflicts:
NEWS
configure.ac


Trivial merge
Domain: System / IPC;