Daniel Molkentin 45ec489f71 Merge branch 'master' of github.com:shadone/mirall into shadone-master ... Conflicts: cmake/modules/QtVersionAbstraction.cmake src/CMakeLists.txt src/mirall/owncloudgui.cpp		2014-03-25 19:56:45 +01:00
..
3rdparty	Added Mac-specific settings dialog that looks more native	2014-02-18 02:22:16 +01:00
creds	Token Credentials: Support actual tokens	2014-03-21 17:12:26 +01:00
mirall	Merge branch 'master' of github.com:shadone/mirall into shadone-master	2014-03-25 19:56:45 +01:00
owncloudcmd	Fix compile after changing Account::davPath()	2014-03-22 09:41:32 +01:00
updater	OCUpdater: Compare to the current version	2014-03-18 00:28:26 +01:00
wizard	Shibboleth: Move browser window to the offset of the setup wizard	2014-02-27 17:07:59 +01:00
CMakeLists.txt	Merge branch 'master' of github.com:shadone/mirall into shadone-master	2014-03-25 19:56:45 +01:00
main.cpp	Add Tests, make Updater classes into a static lib	2014-01-29 10:43:21 +01:00