Olivier Goffart 512492bf30 Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/libsync/propagatedownload.cpp		2014-12-01 14:37:47 +01:00
..
osx	OS X: Don't use hardcoded name in packages file	2014-11-21 16:34:30 +01:00
win	[tx-robot] updated from transifex	2014-11-29 02:06:10 -05:00
CMakeLists.txt	Create Mac Pack: Copy the creator script to the build directory.	2014-08-26 18:13:43 +02:00