]> 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: 27b73fb a57de58)
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual <samual@decrux.(none)>
Fri, 1 Jun 2012 21:01:48 +0000 (17:01 -0400)
committerSamual <samual@decrux.(none)>
Fri, 1 Jun 2012 21:01:48 +0000 (17:01 -0400)
1  2 
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history

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