]> 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: 8dd9e56 55d3273)
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 patch | diff1 | diff2 | blob | history

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