projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63196f6 f76d174)
Merge branch 'dbus-1.2'
authorThiago Macieira <thiago@kde.org>
Wed, 13 May 2009 13:52:18 +0000 (15:52 +0200)
committerThiago Macieira <thiago@kde.org>
Wed, 13 May 2009 13:52:18 +0000 (15:52 +0200)
Conflicts:
dbus/dbus-sysdeps-util-unix.c


Trivial merge
Domain: System / IPC;