Resolved more conflicts
authorPhilip Rauwolf <rauwolf@itestra.de>
Tue, 15 Jan 2013 13:06:59 +0000 (14:06 +0100)
committerPhilip Rauwolf <rauwolf@itestra.de>
Tue, 15 Jan 2013 13:06:59 +0000 (14:06 +0100)
commit6ac207b211ab3d6c93dcedc9c777820f57e35e6a
treef2081a2f6dae2d951200e81b98b0b3798fa07857
parented4ce5a098f857ee90a7bf1f08c165ec8aafc110
Resolved more conflicts
src/test/DBusVariantTest.cpp