projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f934a96 2adf484)
Merge branch 'dbus-1.4', rejecting all changes
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 14 Mar 2011 11:53:24 +0000 (11:53 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 14 Mar 2011 11:54:43 +0000 (11:54 +0000)
This commit changes nothing, but means that merge tracking won't try to
apply the reversion of d1d395774435..09c9d6406b75f to master in future.


Trivial merge
Domain: System / IPC;