Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'version-3-3' 

Conflicts:
	.travis.yml
	src/build.h
This commit is contained in:
Enno Rehling 2014-12-11 13:03:31 +01:00
parent 20234ca27a 1864d1fc86
commit cfc0972912
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -5,4 +5,4 @@ compiler:
script: s/travis-build
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq libtolua-dev liblua5.1-dev libncurses5-dev libsqlite3-dev libxml2-dev
- sudo apt-get install -qq libtolua-dev liblua5.1-dev libncurses5-dev libsqlite3-dev libxml2-dev

2
critbit

@ -1 +1 @@
Subproject commit c267f95e4170c40809effa61af418fbe63d43e48
Subproject commit 2a7af5e2347217ea4efcf7fb3f0bc9c2681d1a17

2
process/cron/run-eressea
View File

@ -34,6 +34,6 @@ if [ ! -s $REPORTS/reports.txt ]; then
fi
$BIN/compress.sh $GAME $TURN
$BIN/sendreports.sh $GAME
$BIN/backup-eressea $GAME
$BIN/backup-eressea $GAME $TURN
[ $GAME -lt 4 ] && $BIN/send-summary $GAME
rm -f test/execute.lock

3
src/build.h Normal file
View File

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

2
storage

@ -1 +1 @@
Subproject commit bcc2874cf289a1d0fc9cc79ff3ed271403b2e24c
Subproject commit c6103e59c0938b173c0e08a852ff1cbbc4e284e3