Olivier Goffart e5a8cd4521 Merge branch '1.5' ... Conflicts: VERSION.cmake		2014-03-06 14:10:08 +01:00
..
3rdparty	Make it compile with the merge of csync mirall	2014-01-15 12:20:03 +01:00
creds	Merge branch '1.5'	2014-03-06 14:10:08 +01:00
mirall	Merge branch '1.5'	2014-03-06 14:10:08 +01:00
owncloudcmd	csync: Remove more unused stuff	2014-02-27 13:33:22 +01:00
updater	Mac OS: Build fix	2014-02-06 22:32:17 +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 '1.5'	2014-03-06 14:10:08 +01:00
main.cpp	Add Tests, make Updater classes into a static lib	2014-01-29 10:43:21 +01:00