]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 2 Nov 2011 15:31:09 +0000 (15:31 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 2 Nov 2011 15:31:09 +0000 (15:31 +0000)
1  2 
dbus/dbus-sysdeps-unix.c
test/Makefile.am

Simple merge
Simple merge