nextcloud-desktop/cmake
Olivier Goffart 33289bde29 Merge remote-tracking branch 'origin/1.5'
Conflicts:
	CMakeLists.txt
	VERSION.cmake
	src/CMakeLists.txt
2014-03-14 17:27:50 +01:00
..
modules Merge remote-tracking branch 'origin/1.5' 2014-03-14 17:27:50 +01:00
scripts Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00