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
..
osx	fix resources path and permissions	2014-10-23 16:42:32 -04:00
win	[tx-robot] updated from transifex	2014-10-22 02:06:40 -04:00
CMakeLists.txt	Create Mac Pack: Copy the creator script to the build directory.	2014-08-26 18:13:43 +02:00