projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70c5285 c6992fc)
Merge branch 'dbus-1.2'
authorColin Walters <walters@verbum.org>
Wed, 15 Jul 2009 21:39:17 +0000 (17:39 -0400)
committerColin Walters <walters@verbum.org>
Wed, 15 Jul 2009 21:39:17 +0000 (17:39 -0400)
Conflicts:
configure.in

1  2 
configure.in patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
Domain: System / IPC;