Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Mon, 6 Jan 2014 03:05:51 +0000 (14:05 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 6 Jan 2014 03:05:51 +0000 (14:05 +1100)
commit490131c400cb22079f9713ecb2d2830b84118987
treee77dc1e8b3da700436d91050bd695e05ee52a7bc
parentafce5408e3b640c1993c3fdbe64340358779551f
parent1d5e1547c9a4df43a3baf1df9d035ea480092f43
Merge branch 'master' into Mario/monsters
defaultXonotic.cfg
gamemodes.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_lms.qc
qcsrc/server/teamplay.qc
qcsrc/server/vehicles/vehicles.qc