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

Merge branch 'release-774' 

Conflicts:
	shared/src/gamecode/market_test.c
	shared/src/kernel/item.c
	shared/src/kernel/item_test.c
	shared/src/tests.c
	shared/src/tests_test.c
This commit is contained in:
Enno Rehling 2012-05-30 08:12:46 +02:00
parent 36ad727394 ee2709e021
commit 46d02cf226
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests.c
View File

@ -116,7 +116,7 @@ void test_cleanup(void)
global.functions.maintenance = NULL; global.functions.maintenance = NULL;
global.functions.wage = NULL; global.functions.wage = NULL;
default_locale = 0; default_locale = 0;
free_locales(); /* TODO: this is evil and leaky */ free_locales();
free_spells(); free_spells();
free_spellbooks(); free_spellbooks();
free_gamedata(); free_gamedata();