Michael Schuster 712fef0cac Merge branch 'master' into qml-singleton-style and fix merge conflict ... Migrate changes in client.qrc to resources.qrc Signed-off-by: Michael Schuster <michael@schuster.ms>		2020-03-01 06:47:46 +01:00
..
3rdparty	Cleanup/Removal/Adaption/Update to resource files and crresponding code, esp. regarding svg usage	2020-01-18 17:47:17 +01:00
cmd	Adapted for cmd version and added migration step for config file	2019-09-26 17:47:01 +02:00
common	Avatar, full user name and server address now reflected in QML gui, provided by C++ backend	2019-12-03 07:26:59 +01:00
crashreporter	More fixes for the OSX daily builds	2018-06-21 15:22:53 +02:00
csync	Merge branch 'master' into testSyncFileStatusTracker-winPath	2019-10-17 13:37:01 +02:00
gui	Merge branch 'master' into qml-singleton-style and fix merge conflict	2020-03-01 06:47:46 +01:00
libsync	Merge branch 'master' into resource-cleanup	2020-03-01 05:34:12 +01:00
CMakeLists.txt	Introduced Style module	2020-01-19 20:13:12 +01:00