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

13 years ago · 10b26fac21
parent ebef0f14d8 9c40288074
commit 10b26fac21
3 changed files with 384 additions and 886 deletions
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@ -7,8 +7,8 @@ CONFIG += debug_and_release \
   no_include_pwd

 VERSION_MAJ = 1
-VERSION_MIN = 05
-VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
+VERSION_MIN = 00
+VERSION_TYPE = r # a = alpha, b = beta, r = release, other => error
 VERSION_PATCH = 00

 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
--- 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