Merge branch 'master' into divVerent/4team_ctf
authorMario <mario.mario@y7mail.com>
Thu, 20 Mar 2014 02:15:31 +0000 (13:15 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 20 Mar 2014 02:15:31 +0000 (13:15 +1100)
commit396fefda7f6c70cb882f78a77fec57a3996f8f80
tree433dcb52af7b8f7da4b037b5b42f07fb93ecdf4a
parentc1625990d69a51bad5b537d2654e32a6f2b40e31
parentf65d6c4047bfc05f465e3cf2878de9f368b66bad
Merge branch 'master' into divVerent/4team_ctf
gamemodes.cfg
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/items.qh
qcsrc/server/autocvars.qh