nextcloud-desktop/src
Daniel Molkentin dc1e73dcb7 Merge remote-tracking branch 'origin/1.7'
Conflicts:
	src/libsync/syncjournaldb.cpp
	test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
..
3rdparty Move qtmacgoodies module forward 2014-10-22 14:43:03 +02:00
cmd options are required at the beginning of owncloudcmd. 2014-10-26 15:33:50 -05:00
gui Merge remote-tracking branch 'origin/1.7' 2014-10-28 23:27:58 -04:00
libsync Merge remote-tracking branch 'origin/1.7' 2014-10-28 23:27:58 -04:00
CMakeLists.txt CMake: Fix RPATH 2014-10-21 15:39:31 +02:00