Merge branch 'version-3-3'

Conflicts:
	src/build.h

process/cron/run-eressea

@@ -26,15 +26,17 @@ if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then
   echo "server did not create orders for turn $TURN in game $GAME"
   exit 2
 fi
+if [ ! -s $REPORTS/reports.txt ]; then
+  echo "server did not create reports.txt in game $GAME"
+  exit 4
+fi
+$BIN/backup-eressea $GAME $TURN
 let TURN=$TURN+1
 if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then
   echo "server did not create data for turn $TURN in game $GAME"
   exit 3
 fi
-if [ ! -s $REPORTS/reports.txt ]; then
-  echo "server did not create reports.txt for turn $TURN in game $GAME"
-  exit 4
-fi
+echo "sending reports for game $GAME, turn $TURN"
 $BIN/compress.sh $GAME $TURN
 $BIN/sendreports.sh $GAME
 $BIN/backup-eressea $GAME $TURN

scripts/eressea/eternath.lua

@@ -23,7 +23,7 @@ local eternath = {}
 
 function eternath.update()
     if b1 and b2 then
-		local size = 5
+        local size = 5
         local units1 = gates.units(b1, size)
         local units2 = gates.units(b2, size)
 

src/buildno.h

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