]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
projects / thirdparty / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8ce351 5df8c3d)
Merge commit '5df8c3db12590edd68e968975a335da9d0415e5a' into new-master
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 4 Jan 2012 18:13:27 +0000 (18:13 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 4 Jan 2012 18:14:37 +0000 (18:14 +0000)
Reject its changes so that git merge-tracking will not want to revert the
changes that were unsuitable for 1.4.


Trivial merge
Mirror of https://gitlab.freedesktop.org/dbus/dbus.git