Merge branch 'master' of ssh://drop.maemo.org/git/vicar
authorSudheer K <scifi1947 at gmail.com>
Sat, 14 Jan 2012 06:11:07 +0000 (22:11 -0800)
committerSudheer K <scifi1947 at gmail.com>
Sat, 14 Jan 2012 06:11:07 +0000 (22:11 -0800)
commit2beca638f4ba146e25320c9c07cc1f29d0b2bba2
tree6c7194cb2c1efd39e04e751df84fa549fe87d120
parent2b82f07726d657dff4ad091f056b8685d5ba9930
parent74800375ecf7f41e290cf7cc7fa9ee8b230be68e
Merge branch 'master' of ssh://drop.maemo.org/git/vicar

Conflicts:
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/gconfutility.cpp
src/vicar-lib/cpp/gconfutility.h
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/cpp/main.cpp
src/vicar-telepathy/vicar-telepathy.pro
src/vicar-utils/cpp/main.cpp
17 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/cpp/callrouter.cpp
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
welcome