Merge branch 'my-dbus-1.2'
authorColin Walters <walters@verbum.org>
Mon, 1 Feb 2010 22:27:26 +0000 (17:27 -0500)
committerColin Walters <walters@verbum.org>
Mon, 1 Feb 2010 22:27:26 +0000 (17:27 -0500)
1  2 
bus/bus.c
bus/dir-watch-inotify.c

diff --cc bus/bus.c
Simple merge
Simple merge