projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 427ff01 3d6abf6)
Merge commit '3d6abf64d0abb2718e082e120f14f8f923a4af59' into dbus-1.2
authorColin Walters <walters@verbum.org>
Tue, 16 Dec 2008 17:29:04 +0000 (12:29 -0500)
committerColin Walters <walters@verbum.org>
Tue, 16 Dec 2008 17:29:04 +0000 (12:29 -0500)
1  2 
bus/system.conf.in patch | diff1 | diff2 | blob | history
test/name-test/tmp-session-like-system.conf patch | diff1 | diff2 | blob | history

diff --cc bus/system.conf.in
Simple merge
Domain: System / IPC;