From: terencehill <piuntn@gmail.com>
Date: Tue, 2 Oct 2012 17:08:40 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/itemstime
X-Git-Tag: xonotic-v0.8.1~12^2~33
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=138e8a13857ec32c09da2335049b82d576736b47;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/itemstime
---

138e8a13857ec32c09da2335049b82d576736b47
diff --cc qcsrc/server/g_world.qc
index cbe31ec1c,4cd5cc810..fb211aaeb
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -547,9 -560,7 +560,8 @@@ void spawnfunc___init_dedicated_server(
  
  void Map_MarkAsRecent(string m);
  float world_already_spawned;
- void RegisterWeapons();
  void Nagger_Init();
 +void Item_ItemsTime_Init();
  void ClientInit_Spawn();
  void WeaponStats_Init();
  void WeaponStats_Shutdown();