projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0f9ced 21a7873)
Merge remote-tracking branch 'origin/dbus-1.8'
authorRalf Habacker <ralf.habacker@freenet.de>
Wed, 6 May 2015 10:14:31 +0000 (12:14 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Wed, 6 May 2015 10:14:31 +0000 (12:14 +0200)
1  2 
dbus/dbus-message.c patch | diff1 | diff2 | blob | history
dbus/dbus-nonce.c patch | diff1 | diff2 | blob | history

diff --cc dbus/dbus-message.c
Simple merge
diff --cc dbus/dbus-nonce.c
Simple merge
Domain: System / IPC;