projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e40c45f 085e773)
Merge branch 'dbus-1.2'
authorWill Thompson <will.thompson@collabora.co.uk>
Tue, 22 Jun 2010 16:25:20 +0000 (17:25 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Tue, 22 Jun 2010 16:25:20 +0000 (17:25 +0100)
1  2 
bus/config-parser-trivial.c patch | diff1 | diff2 | blob | history
bus/config-parser-trivial.h patch | diff1 | diff2 | blob | history

diff --cc bus/config-parser-trivial.c
Simple merge
diff --cc bus/config-parser-trivial.h
Simple merge
Domain: System / IPC;