]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Aug 2012 19:02:11 +0000 (20:02 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Aug 2012 19:02:11 +0000 (20:02 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge