projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11b31b8 4ebb275)
Merge branch 'dbus-1.4' rejecting commit 4ebb275ab7b6f71d5
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 23 Jan 2012 11:14:45 +0000 (11:14 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 23 Jan 2012 11:14:45 +0000 (11:14 +0000)
Conflicts:
configure.ac


Trivial merge
Domain: System / IPC;