Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Aug 2011 13:18:27 +0000 (14:18 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Aug 2011 13:18:27 +0000 (14:18 +0100)
commitd6ad37c3044ed6c72bf652c6e505c6ad9aa9e889
tree22a29481bd49da19f4bcdbe6494ad2f86bfa35eb
parent0a7da74b0b6dbb87d54353e5ff71217aba4f6745
parentc1bcd2269c590305cad42e000cd39fad49158e3e
Merge branch 'dbus-1.4'
cmake/CMakeLists.txt