Merge branch 'master' into terencehill/ca_fixes
authorterencehill <piuntn@gmail.com>
Wed, 19 Feb 2014 17:30:53 +0000 (18:30 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 19 Feb 2014 17:30:53 +0000 (18:30 +0100)
commit3b0e076988a8daae0310a764049fe06c1a4666ca
tree0c0b7383e91abf09d9b5253c951d071f810526ab
parent6080067ca0e4ef0683d2a94ee6543299beca01ed
parentcff9142d7732b7722fc7878fa6a98a4548823e43
Merge branch 'master' into terencehill/ca_fixes

Conflicts:
qcsrc/server/cl_player.qc
gamemodes.cfg
qcsrc/server/cl_player.qc