]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 25 May 2011 16:39:34 +0000 (17:39 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 25 May 2011 16:39:34 +0000 (17:39 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge