Fixed Merge issues
authorSudheer K <scifi1947 at gmail.com>
Sat, 14 Jan 2012 07:17:32 +0000 (23:17 -0800)
committerSudheer K <scifi1947 at gmail.com>
Sat, 14 Jan 2012 07:17:32 +0000 (23:17 -0800)
commita39e35febe1d76a81b5c4ac452ac64309d1bc622
tree513e69259df6c129128261abb6d275f1be0fd803
parent2beca638f4ba146e25320c9c07cc1f29d0b2bba2
Fixed Merge issues
15 files changed:
qtc_packaging/debian_harmattan/prerm
qtc_packaging/debian_harmattan/rules
qtc_packaging/debian_harmattan/vicar.aegis
qtc_packaging/debian_harmattan/vicar.substvars
src/data/accounts/vicar.service
src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js
src/vicar-daemon/vicar-daemon.pro
src/vicar-lib/cpp/logutility.h
src/vicar-lib/cpp/telepathyutility.cpp
src/vicar-lib/vicar-lib.pro
src/vicar-telepathy/cpp/connection.cpp
src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
src/vicar-telepathy/cpp/connectionmanager.cpp
src/vicar-telepathy/vicar-telepathy.pro
src/vicar-utils/cpp/main.cpp