]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19a4a52 37b5196)
Merge remote-tracking branch 'origin/mrbougo/killspree_bugfix'
authorJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 18:17:15 +0000 (20:17 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 18:17:15 +0000 (20:17 +0200)
1  2 
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/g_damage.qc
Simple merge