projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cd1862 6db5327)
Merge branch 'dbus-1.10-ci'
authorSimon McVittie <smcv@debian.org>
Wed, 2 Dec 2015 18:51:57 +0000 (18:51 +0000)
committerSimon McVittie <smcv@debian.org>
Wed, 2 Dec 2015 18:52:10 +0000 (18:52 +0000)
No actual change; this is just to mark the conflicts as resolved.


Trivial merge
Domain: System / IPC;