projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e15ebf3 5ec835d)
Merge branch 'dbus-1.4'
authorRalf Habacker <ralf.habacker@freenet.de>
Sun, 25 Dec 2011 13:34:59 +0000 (14:34 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Sun, 25 Dec 2011 13:34:59 +0000 (14:34 +0100)
Conflicts:
dbus/dbus-spawn-win.c


Trivial merge
Domain: System / IPC;