Merge remote-tracking branch 'origin/dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 11 Jul 2011 12:23:38 +0000 (13:23 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 11 Jul 2011 12:23:38 +0000 (13:23 +0100)
commit0ecd0a02b993685a456da58c5c03e2d3bab17d67
tree4c48546a712205bcc44691aa1991044fdc61495f
parentea8aabf0be9cbe5bd4dcdf406a620ed6073951fc
parentfa1a85e121e2e6b4e3a517ba61b79922f59d591f
Merge remote-tracking branch 'origin/dbus-1.4'
cmake/CMakeLists.txt