Merge branch 'master' into divVerent/4team_ctf
authorMario <mario.mario@y7mail.com>
Tue, 28 Jan 2014 05:43:05 +0000 (16:43 +1100)
committerMario <mario.mario@y7mail.com>
Tue, 28 Jan 2014 05:43:05 +0000 (16:43 +1100)
commitc1625990d69a51bad5b537d2654e32a6f2b40e31
tree403e7ace062a245de91d0b0204147890823493ba
parent25ce29546c1ade2675975d8f406c4972f7979319
parent7e9d4404fbd602050e843cb2169f8afab4163b11
Merge branch 'master' into divVerent/4team_ctf
effectinfo.txt
gamemodes.cfg
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qc