Merge branch 'master' into Mario/mutators
authorMario <mario.mario@y7mail.com>
Tue, 25 Jun 2013 13:05:43 +0000 (23:05 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 25 Jun 2013 13:05:43 +0000 (23:05 +1000)
1  2 
defaultXonotic.cfg
gamemodes.cfg
qcsrc/server/cl_client.qc
qcsrc/server/progs.src
qcsrc/server/t_items.qc

Simple merge
diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge
Simple merge