mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
3016844dd7
nextcloud-desktop/src
History
Daniel Molkentin 3016844dd7 Merge branch 'master' into rename_client 
Conflicts:
	README.md
	src/gui/folderman.cpp
	src/gui/settingsdialog.cpp
	src/libsync/accessmanager.cpp
	src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
..
3rdparty Merge remote-tracking branch 'origin/master' into crashreporter 2014-11-11 23:53:38 +01:00
cmd Merge branch 'master' into rename_client 2014-11-12 00:07:59 +01:00
crashreporter Add crash reporter to osx package and don't build it with BUILD_LIBRARIES_ONLY enabled 2014-08-30 14:45:39 +02:00
gui Merge branch 'master' into rename_client 2014-12-02 13:37:22 +01:00
libsync Merge branch 'master' into rename_client 2014-12-02 13:37:22 +01:00
CMakeLists.txt Merge remote-tracking branch 'origin/master' into crashreporter 2014-11-11 23:53:38 +01:00