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
3c2bb1e2bc
nextcloud-desktop/cmake/modules
History
Olivier Goffart 0589bfc51b Merge branch 'master' into propagator-ng 
This just fix the conflict.
Do not compile or work yet

Conflicts:
	src/CMakeLists.txt
	src/mirall/csyncthread.cpp
	src/mirall/csyncthread.h
	src/mirall/owncloudfolder.cpp
	src/mirall/syncfileitem.h
	test/CMakeLists.txt
2013-08-14 15:19:21 +02:00
..
AddAppIconMacro.cmake Fatal error if svn2ico is missing. 2012-08-13 15:05:40 +03:00
FindCsync.cmake Changed FindCSync module to not check relative pathes + docu. 2013-01-22 15:08:56 +01:00
FindINotify.cmake Find inotify on multiarch debian/ubuntu 2012-12-04 17:48:14 +01:00
FindNeon.cmake New owncloud propagator that skip the vio abstraction layer 2013-05-04 11:02:30 +02:00
FindPdfLatex.cmake Add doc cmake targets (HTML, PDF, QtHelp, CHM, man) 2012-11-25 00:38:47 +01:00
FindQtKeychain.cmake Fix cmake checks on QtKeyChain. 2012-11-28 10:44:25 +01:00
FindSphinx.cmake Add doc cmake targets (HTML, PDF, QtHelp, CHM, man) 2012-11-25 00:38:47 +01:00
GetGitRevisionDescription.cmake Update About dialog 2012-12-20 20:35:21 +01:00
GetGitRevisionDescription.cmake.in Update About dialog 2012-12-20 20:35:21 +01:00
GNUInstallDirs.cmake Add missing GNUInstallDirs module for cmake. 2012-04-21 11:22:03 +02:00
MacOSXBundleInfo.plist.in Prepare for Mac package signing. 2012-10-09 01:40:43 +02:00
NSIS.InstallOptions.ini.in Add win32 packaging with nsi 2012-04-02 13:44:24 +02:00
NSIS.template.in NSIS: install libjpeg for qjpeg4.dll 2013-08-08 15:39:34 +02:00
Warnings.cmake -Wno-long-long required due to Qt headers 2013-08-07 13:19:21 +02:00