mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 23:17:13 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-desktop/cmake
History
Christian Kamm 7ae0338f5c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/socketapi.h
	src/libsync/syncengine.h
	test/CMakeLists.txt
2014-10-22 10:41:55 +02:00
..
modules Merge remote-tracking branch 'origin/1.7' 2014-10-22 10:41:55 +02:00
scripts Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00