Merge branch 'version-3-3'

Conflicts: src/build.h
2014-12-27 23:57:16 +01:00 · 2014-12-27 23:57:16 +01:00 · 975b930f44
commit 975b930f44
parent f1008fa231 df3ce116a7
2 changed files with 2 additions and 1 deletions
--- a/scripts/eressea/eternath.lua
+++ b/scripts/eressea/eternath.lua
@ -22,6 +22,7 @@ end
 local eternath = {}

 function eternath.update()
+    local size = 1
    if b1 and b2 then
 		local size = 5
        local units1 = gates.units(b1, size)
--- a/src/buildno.h
+++ b/src/buildno.h
@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 4
-#define VERSION_BUILD 694
+#define VERSION_BUILD 695