]> 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: 6d2827d 6bc6699)
Merge remote-tracking branch 'origin/mirceakitsune/bugfix_impact_effects'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 29 Feb 2012 09:45:00 +0000 (10:45 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 29 Feb 2012 09:45:00 +0000 (10:45 +0100)
1  2 
qcsrc/client/damage.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/damage.qc
Simple merge