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

Merge pull request #403 from ennorehling/release-3.7

Browse source 
fix a minor warning, get ready for 3.7 release
This commit is contained in:
Enno Rehling 2015-11-16 14:27:23 +01:00
commit c404f40d86
5 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/buildings/castle-2.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<building name="castle" capacity="1" fort="1">
<building name="castle" capacity="1" fort="yes">
<function name="name" value="castle_name_2"/>
<function name="protection" value="building_protection"/>
<function name="taxes" value="lua_building_taxes"/>

2
res/buildings/castle.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<building name="castle" capacity="1" fort="1">
<building name="castle" capacity="1" fort="yes">
<function name="name" value="castle_name"/>
<function name="protection" value="building_protection"/>
<construction skill="building" minskill="1" maxsize="2" reqsize="1" defense_bonus="0">

2
res/e3a/buildings.xml
View file

@ -3,7 +3,7 @@
<xi:include href="config://default/buildings/castle-2.xml" />
<building name="watch" capacity="1" maxsize="10" fort="1">
<building name="watch" capacity="1" maxsize="10" fort="yes">
<function name="name" value="fort_name"/>
<function name="protection" value="building_protection"/>
<function name="taxes" value="lua_building_taxes"/>

1
s/coverity
View file

@ -1,6 +1,7 @@
#!/bin/bash
set -e
VERSION="$1"
echo "submitting version $VERSION"
shift
DESC="$*"
cd Debug

2
src/buildno.h
View file

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3
#define VERSION_MINOR 7
#define VERSION_BUILD 1
#define VERSION_BUILD 2