nextcloud-desktop/cmake
Christian Kamm 4d7b8bdb25 Merge remote-tracking branch 'origin/1.7'
Conflicts:
	OWNCLOUD.cmake
	test/CMakeLists.txt
	test/testfolderwatcher.h
2014-11-19 14:45:25 +01:00
..
modules Merge remote-tracking branch 'origin/1.7' 2014-11-19 14:45:25 +01:00
scripts Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00