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

Merge branch 'version-3-3' 

Conflicts:
	src/build.h
This commit is contained in:
Enno Rehling 2014-12-27 23:57:16 +01:00
parent f1008fa231 df3ce116a7
commit 975b930f44
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/eressea/eternath.lua
View File

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

2
src/buildno.h
View File

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