]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/no_damagedbycontents_when_gibbed
authorterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:50:44 +0000 (23:50 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:50:44 +0000 (23:50 +0200)
1  2 
qcsrc/server/cl_player.qc

Simple merge