Resolve conflict
authorAleksandar Kanchev <kanchev@itestra.com>
Mon, 14 Jan 2013 17:41:42 +0000 (18:41 +0100)
committerPhilip Rauwolf <rauwolf@itestra.de>
Tue, 15 Jan 2013 12:36:12 +0000 (13:36 +0100)
commit199033765b2df7ba8c5f1679aa522337d872ec71
tree9a8f91f95540caabc440253c509a81cb63118d65
parentbad6403a00cc9b04bed69a150b3107a08711e8ac
Resolve conflict
Makefile.am
src/CommonAPI/DBus/DBusOutputStream.h
src/test/DBusTypeStreamTest.cpp [new file with mode: 0644]
src/test/DBusVariantTest.cpp