projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc5404c 337d943)
Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 17:21:09 +0000 (18:21 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 17:21:09 +0000 (18:21 +0100)
Conflicts:
NEWS
configure.ac


Trivial merge
Domain: System / IPC;