]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ec09d8 7cd3da8)
Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Mon, 28 Mar 2011 18:23:01 +0000 (14:23 -0400)
committerSamual <samual@xonotic.org>
Mon, 28 Mar 2011 18:23:01 +0000 (14:23 -0400)
1  2 
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history
qcsrc/server/progs.src patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/g_damage.qc
Simple merge
diff --cc qcsrc/server/progs.src
index 71f51b694f3297e755b5d1dfb96b9dfba0b23ef3,cf5c7d6a8269e3eecc1f1e13c6043d85df930da7..a86de49358f73c267016936a6b3e504c5337cc7e
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -180,8 -180,9 +181,10 @@@ anticheat.q
  cheats.qc
  playerstats.qc
  
+ ../common/explosion_equation.qc
+ 
  mutators/base.qc
 +mutators/gamemode_ctf.qc
  mutators/gamemode_keyhunt.qc
  mutators/gamemode_freezetag.qc
  mutators/gamemode_keepaway.qc