]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 22 Mar 2013 06:23:47 +0000 (17:23 +1100)
committerMario <mario.mario@y7mail.com>
Fri, 22 Mar 2013 06:23:47 +0000 (17:23 +1100)
commit19908b418a17743f83666a6720a53ccafa6e61f8
treedbe9de3094103a777b00001de5efa22826c77cae
parentd6f31d26248d2d231c3a77b7de0eeb7f8968c188
parent2eb667170068c570763b07108da07c05622a4f93
Merge branch 'master' into Mario/monsters
17 files changed:
defaultXonotic.cfg
gamemodes.cfg
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.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/mutators/base.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/teamplay.qc