]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Thu, 31 Jan 2013 10:37:26 +0000 (21:37 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 31 Jan 2013 10:37:26 +0000 (21:37 +1100)
commite9b6376496a752bb18bf60c729e687838a52a244
tree3559a9bc721b582a1e74488f18c4aca1923953f3
parente4eedaffd55137fba8942cbb386958e2bd962111
parent9c135628c252c5655c452c7143e14461391c7799
Merge branch 'master' into mario/monsters
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_physics.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src