Merge branch 'master' into cleanup

Conflicts:
	CHANGELOG
	src/g_combat.c
	src/g_func.c
	src/g_items.c
This commit is contained in:
Yamagi Burmeister 2013-01-05 12:34:59 +01:00
commit 6e48d1aa2a
24 changed files with 320 additions and 153 deletions

View file

@ -120,6 +120,9 @@ GetGameAPI(game_import_t *import)
globals.edict_size = sizeof(edict_t);
/* Initalize the PRNG */
randk_seed();
return &globals;
}