projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33c4394 25d6d2d)
Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4
authorRalf Habacker <ralf.habacker@freenet.de>
Wed, 21 Dec 2011 19:40:22 +0000 (20:40 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Wed, 21 Dec 2011 19:40:22 +0000 (20:40 +0100)
1  2 
cmake/CMakeLists.txt patch | diff1 | diff2 | blob | history
configure.ac patch | diff1 | diff2 | blob | history
dbus/dbus-sysdeps-unix.c patch | diff1 | diff2 | blob | history
dbus/dbus-sysdeps-win.c patch | diff1 | diff2 | blob | history
test/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc cmake/CMakeLists.txt
Simple merge
diff --cc configure.ac
Simple merge
diff --cc dbus/dbus-sysdeps-unix.c
Simple merge
diff --cc dbus/dbus-sysdeps-win.c
Simple merge
diff --cc test/Makefile.am
Simple merge
Domain: System / IPC;