Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 20 Dec 2013 18:02:41 +0000 (05:02 +1100)
committerMario <mario.mario@y7mail.com>
Fri, 20 Dec 2013 18:02:41 +0000 (05:02 +1100)
commit4a33100bf6a3b684157c104c39fd47f4a810a735
treedc7afb313df63b71515e55330707ca89df1106f5
parent695a573f7bf796ab9d1f936ae0b161a5a4f057d2
parentcf8895a5790c2ae048c71e0f53bae6409a5500c1
Merge branch 'master' into Mario/monsters
qcsrc/common/csqcmodel_settings.qh
qcsrc/server/cl_player.qc