projects
/
vicar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://drop.maemo.org/git/vicar
[vicar]
/
src
/
vicar-lib
/
vicar-lib.pro
diff --git
a/src/vicar-lib/vicar-lib.pro
b/src/vicar-lib/vicar-lib.pro
index
d799730
..
f473289
100755
(executable)
--- a/
src/vicar-lib/vicar-lib.pro
+++ b/
src/vicar-lib/vicar-lib.pro
@@
-19,6
+19,10
@@
OBJECTS_DIR = cpp/.objs
DESTDIR = ../lib
SOURCES += cpp/dbusutility.cpp \
DESTDIR = ../lib
SOURCES += cpp/dbusutility.cpp \
+<<<<<<< HEAD
+=======
+ cpp/gconfutility.cpp \
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
cpp/telepathyutility.cpp \
cpp/accountmanagerproxy.cpp \
cpp/accountproxy.cpp \
cpp/telepathyutility.cpp \
cpp/accountmanagerproxy.cpp \
cpp/accountproxy.cpp \
@@
-28,6
+32,10
@@
SOURCES += cpp/dbusutility.cpp \
cpp/databaseutility.cpp \
cpp/harmattanaccountutility.cpp
HEADERS += cpp/dbusutility.h \
cpp/databaseutility.cpp \
cpp/harmattanaccountutility.cpp
HEADERS += cpp/dbusutility.h \
+<<<<<<< HEAD
+=======
+ cpp/gconfutility.h \
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
cpp/telepathyutility.h \
cpp/accountmanagerproxy.h \
cpp/accountproxy.h \
cpp/telepathyutility.h \
cpp/accountmanagerproxy.h \
cpp/accountproxy.h \