Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sat, 28 Sep 2013 08:08:52 +0000 (01:08 -0700)
committerMario <mario.mario@y7mail.com>
Sat, 28 Sep 2013 08:08:52 +0000 (01:08 -0700)
1  2 
defaultXonotic.cfg
qcsrc/common/mapinfo.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/t_items.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge