projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14f3767 a7169e6)
Merge branch 'my-dbus-1.2'
authorColin Walters <walters@verbum.org>
Tue, 2 Feb 2010 16:00:09 +0000 (11:00 -0500)
committerColin Walters <walters@verbum.org>
Tue, 2 Feb 2010 16:00:09 +0000 (11:00 -0500)
Conflicts:
configure.in

1  2 
dbus/dbus-sysdeps-unix.c patch | diff1 | diff2 | blob | history

diff --cc dbus/dbus-sysdeps-unix.c
Simple merge
Domain: System / IPC;