Fixed Demo Mainloop
authorPhilip Rauwolf <rauwolf@itestra.de>
Wed, 7 Aug 2013 12:54:45 +0000 (14:54 +0200)
committerStefan Laner <laner@itestra.de>
Wed, 7 Aug 2013 13:08:33 +0000 (15:08 +0200)
commit9f66fbe2099558c08b2f10c03262c4ad220f0ec3
tree56c3ecc736cc1d6bd9eda892d7881223621afc91
parentd5c7906b728d6a03c468d9c4211417f97702494a
Fixed Demo Mainloop

Conflicts:
src/test/DemoMainLoop.h
src/test/DBusProxyTest.cpp
src/test/DemoMainLoop.h