Daniel Molkentin 281c0e1553 Merge branch 'master' into rename_client ... Conflicts: CMakeLists.txt src/gui/main.cpp src/libsync/accessmanager.cpp src/libsync/accessmanager.h src/libsync/owncloudpropagator_p.h		2014-11-12 00:07:59 +01:00
..
CMakeLists.txt	Merge remote-tracking branch 'origin/master' into crashreporter	2014-11-11 23:53:38 +01:00
cmd.cpp	Merge branch 'master' into rename_client	2014-11-12 00:07:59 +01:00
cmd.h	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00
netrcparser.cpp	Adjust namespaces	2014-11-09 22:34:07 +01:00
netrcparser.h	Adjust namespaces	2014-11-09 22:34:07 +01:00
simplesslerrorhandler.cpp	Fix header names	2014-11-09 23:25:57 +01:00
simplesslerrorhandler.h	Adjust namespaces	2014-11-09 22:34:07 +01:00