Filip Bucek 7e4a7bf074 Merge branch 'suggest/process-data' into suggest/preapre-data-use-old ...

# Conflicts:
#	src/colnod/databaseapi.cpp
#	src/colnod/databaseapi.h
#	src/colnod/syncmanager.cpp
#	src/colnod/syncmanager.h
#	test/auto/colnod/tst_colnodapi.cpp
#	test/auto/syncmanager/tst_syncmanager.cpp

2019-12-02 15:44:14 +01:00

..

colnod.pri

fix endlines

2019-11-20 16:06:43 +01:00

colnodapi.cpp

Merge branch 'suggest/process-data' into suggest/preapre-data-use-old

2019-12-02 15:44:14 +01:00

colnodapi.h

Merge branch 'suggest/process-data' into suggest/preapre-data-use-old

2019-12-02 15:44:14 +01:00

data.cpp

Clanz and clanzy

2019-11-21 11:50:12 +01:00

data.h

trying to solve unittest crash ( adding more checks )

2019-12-02 15:07:24 +01:00

databaseapi.cpp

Merge branch 'suggest/process-data' into suggest/preapre-data-use-old

2019-12-02 15:44:14 +01:00

databaseapi.h

Merge branch 'suggest/process-data' into suggest/preapre-data-use-old

2019-12-02 15:44:14 +01:00

subject.cpp

bugs fix

2019-11-21 15:33:22 +01:00

subject.h

Finished Info output

2019-11-21 10:39:55 +01:00

syncmanager.cpp

Merge branch 'suggest/process-data' into suggest/preapre-data-use-old

2019-12-02 15:44:14 +01:00

syncmanager.h

Merge branch 'suggest/process-data' into suggest/preapre-data-use-old

2019-12-02 15:44:14 +01:00

token.cpp

Clanz and clanzy

2019-11-21 11:50:12 +01:00

token.h

bugs fix

2019-11-21 15:33:22 +01:00

tokens.json

Change all files to LF

2019-11-08 10:51:31 +01:00