]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/runematch_nuke
authorMario <mario.mario@y7mail.com>
Thu, 7 Mar 2013 06:13:59 +0000 (17:13 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 7 Mar 2013 06:13:59 +0000 (17:13 +1100)
commit39bfc6b0e1d9775ccd116c7d803670af5166cce5
treedd7a4808e9005d3456de98a5507499d528bfb238
parentdca461716d4204384f9bbf8826c05045d59832c7
parent8ca52c052b625e76506d033d16aae0525bd5927a
Merge branch 'master' into mario/runematch_nuke
12 files changed:
gamemodes.cfg
qcsrc/server/arena.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/teamplay.qc