update version number, make preview script use the correct branch

This commit is contained in:
Enno Rehling 2015-02-06 01:40:03 +01:00
parent db79eb2f28
commit fecbac86bc
2 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash
[ -z ${ERESSEA} ] && ERESSEA=~/eressea
branch="master"
branch="develop"
if [ -e ${ERESSEA}/build/.preview ]; then
branch=`cat ${ERESSEA}/build/.preview`
fi

View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3
#define VERSION_MINOR 4
#define VERSION_BUILD 698
#define VERSION_BUILD 0