]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge branch 'dbus-1.4'
authorRalf Habacker <ralf.habacker@freenet.de>
Wed, 21 Dec 2011 19:42:21 +0000 (20:42 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Wed, 21 Dec 2011 19:42:21 +0000 (20:42 +0100)
1  2 
cmake/CMakeLists.txt
configure.ac

Simple merge
diff --cc configure.ac
Simple merge