Merge remote-tracking branch 'origin/terencehill/no_damagedbycontents_when_gibbed'
authorJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 19:54:42 +0000 (21:54 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 19:54:42 +0000 (21:54 +0200)
1  2 
qcsrc/server/cl_player.qc

Simple merge