projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c396b8e 08e2b81)
Merge remote-tracking branch 'origin/dbus-1.8'
authorRalf Habacker <ralf.habacker@freenet.de>
Fri, 1 May 2015 21:08:43 +0000 (23:08 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Fri, 1 May 2015 21:08:43 +0000 (23:08 +0200)
Conflicts:
cmake/test/CMakeLists.txt
test/Makefile.am


Trivial merge
Domain: System / IPC;