From: Samual Lenks <samual@xonotic.org>
Date: Fri, 14 Jun 2013 00:43:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into samual/weapons
X-Git-Tag: xonotic-v0.8.0~152^2~385
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=33095a161b78b2c486fda10f5941d891ce54ad57;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into samual/weapons
---

33095a161b78b2c486fda10f5941d891ce54ad57
diff --cc qcsrc/client/progs.src
index c536ca63d,114f0a5b5..d9cd16ead
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@@ -16,8 -16,10 +16,9 @@@ Defs.q
  
  ../common/teams.qh
  ../common/util.qh
+ ../common/test.qh
  ../common/counting.qh
 -../common/items.qh
 -../common/explosion_equation.qh
 +../common/weapons/weapons.qh // TODO
  ../common/mapinfo.qh
  ../common/command/markup.qh
  ../common/command/rpn.qh
diff --cc qcsrc/server/progs.src
index 037e10449,367e8609d..50b3b0b81
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -15,9 -15,10 +15,10 @@@ sys-post.q
  ../common/constants.qh
  ../common/teams.qh
  ../common/util.qh
+ ../common/test.qh
  ../common/counting.qh
 -../common/items.qh
 -../common/explosion_equation.qh
 +weapons/cl_weapons.qh
 +../common/weapons/weapons.qh // WEAPONTODO
  ../common/urllib.qh
  ../common/command/markup.qh
  ../common/command/rpn.qh