Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Tue, 2 Oct 2012 17:08:40 +0000 (19:08 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 2 Oct 2012 17:08:40 +0000 (19:08 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/t_items.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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();
Simple merge