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
..
osx	OS X: Fix packages file	2014-11-17 17:48:29 +01:00
win	[tx-robot] updated from transifex	2014-11-11 02:06:12 -05:00
CMakeLists.txt	Create Mac Pack: Copy the creator script to the build directory.	2014-08-26 18:13:43 +02:00