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

Merge branch 'version-3-3'

Browse source 
Conflicts:
	src/build.h
	src/vortex.test.c
This commit is contained in:
Enno Rehling 2014-12-12 17:24:00 +01:00
commit ab71860224
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/battle.c
View file

@ -4246,7 +4246,6 @@ void do_battle(region * r)
message_all(b, m); message_all(b, m);
msg_release(m); msg_release(m);
free_battle(b); free_battle(b);
free(b);
return; return;
} }
join_allies(b); join_allies(b);
@ -4293,7 +4292,6 @@ void do_battle(region * r)
if (b) { if (b) {
free_battle(b); free_battle(b);
free(b);
} }
} }

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 691 #define VERSION_BUILD 694