]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit55d3273e61152efe4244561d71c313512c20c20d
tree8c2466b458101838d926a440cd655cc259652925
parent13f10cd400d3d2df99b940fbf8ee8a07f9027621
parenta4ccbd75da12da9090f3d25ad4dc9edd0efe3060
Merge branch 'master' into terencehill/no_damagedbycontents_when_gibbed
qcsrc/server/cl_player.qc