Christian Kamm 53d5de685c Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/gui/folder.cpp src/gui/folder.h src/libsync/networkjobs.cpp src/libsync/owncloudpropagator.h src/libsync/propagatedownload.cpp		2014-12-10 13:01:36 +01:00
..
osx	Mac installer: Make the installer background brandable for MacOSX.	2014-12-03 14:37:59 +01:00
win	[tx-robot] updated from transifex	2014-12-04 02:06:11 -05:00
CMakeLists.txt	Create Mac Pack: Copy the creator script to the build directory.	2014-08-26 18:13:43 +02:00