]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 28 Apr 2013 22:57:23 +0000 (08:57 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 28 Apr 2013 22:57:23 +0000 (08:57 +1000)
commit49e38e46261f04cd3208ac6f26aa00f5c567020b
treeae02f7e0944bdcbee0191ebfacac083f381dcdee
parent829f0de70e51299d15818436e1b999f5b519cd61
parentd6d9cfdafd8f5441bedf898d50e683ff976dae91
Merge branch 'master' into Mario/monsters
13 files changed:
defaultXonotic.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/vehicles/vehicles.qc