Merge branch 'master' into terencehill/bot_fixes
authorterencehill <piuntn@gmail.com>
Sat, 22 Aug 2015 11:29:04 +0000 (13:29 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 22 Aug 2015 11:29:04 +0000 (13:29 +0200)
commit95c7f3405f82d9975617acc0ca4d4bcf5c4acba2
tree1a1d5c0f1e862a1f133b4938b3d3b2e796628f8d
parent6e9d7ad23f843b427ac7b4ba8af5fac6bb422db7
parent068f22a2de30f4352e3b6a937f030d3f09c64b3b
Merge branch 'master' into terencehill/bot_fixes
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc