projects / platform / upstream / dbus.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 705b34f b2f943e)
Merge branch 'dbus-1.2'
authorThiago Macieira <thiago@kde.org>
Tue, 28 Apr 2009 13:16:36 +0000 (15:16 +0200)
committerThiago Macieira <thiago@kde.org>
Tue, 28 Apr 2009 13:16:36 +0000 (15:16 +0200)
commit63196f69c420f55fbb1fa76adaa41877f7f06d7b
treef1d97096f6c821dbd3b995b1e79749fe292e329dtree | snapshot
parent705b34f0a60566c3acc88d5465603b5da959ba1fcommit | diff
parentb2f943e9c0d5ae1d6293d418b0c0b2a03799bb84commit | diff
Merge branch 'dbus-1.2'

Conflicts:
bus/bus.c
bus/config-parser-common.c
bus/config-parser-common.h
bus/config-parser.c
bus/connection.c
bus/dbus-daemon.1.in
dbus/dbus-marshal-validate-util.c
dbus/dbus-marshal-validate.c
dbus/dbus-sysdeps-util-unix.c
test/name-test/tmp-session-like-system.conf
bus/config-parser-common.c diff1 | diff2 | blob | history
bus/config-parser.c diff1 | diff2 | blob | history
dbus/dbus-sysdeps-util-unix.c diff1 | diff2 | blob | history
Domain: System / IPC;