Merge branch 'master' of github.com:Sankore/Sankore-3.1

13 years ago · 048939d677
parent 0b4134633d 9c40288074
commit 048939d677
2 changed files with 382 additions and 884 deletions
--- a/release.macx.sh
+++ b/release.macx.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 # Executables
-QMAKE="/usr/bin/qmake"
+QMAKE="/usr/local/Trolltech/Qt-4.7.3/bin/qmake"
 MACDEPLOYQT="/usr/bin/macdeployqt"
 DMGUTIL="`pwd`/../Sankore-ThirdParty/refnum/dmgutil/dmgutil.pl"
 DSYMUTIL=/usr/bin/dsymutil
--- a/resources/i18n/sankore_fr.ts
+++ b/resources/i18n/sankore_fr.ts