Merge branch 'master' into terencehill/bot_fixes 197/head
authorterencehill <piuntn@gmail.com>
Sun, 23 Aug 2015 15:33:36 +0000 (17:33 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 23 Aug 2015 15:33:36 +0000 (17:33 +0200)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc

Simple merge
Simple merge