projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2eddc32 2f183ac)
Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 26 Aug 2011 14:07:41 +0000 (15:07 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 26 Aug 2011 14:07:41 +0000 (15:07 +0100)
1  2 
bus/main.c patch | diff1 | diff2 | blob | history

diff --cc bus/main.c
Simple merge
Domain: System / IPC;