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)
commit6781e6a622320df88fe4ae04a337227967e8729f
tree6abdd17617535fe4334635d31712aba4bce1dd47
parent18f8c08faff54821b78084eafe7242868c49cc1f
parent4122acc1401e4643ebe47d53b0488de83b93d787
Merge branch 'master' into Mario/mutators
defaultXonotic.cfg
gamemodes.cfg
qcsrc/server/cl_client.qc
qcsrc/server/progs.src
qcsrc/server/t_items.qc