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)
commit867ce0406b74601b6d74a4ac412ac30063490d88
tree69c8207bebd18174d5d7ab6d5228298f770a5e33
parent7a0a311ff868e71c2336e0cdffdadad6a55fac8f
parent8d10ea819c27736320d03e75134af341f8127199
Merge branch 'master' into terencehill/bot_fixes
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc