]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/mutator_minstagib
authorMario <mario.mario@y7mail.com>
Thu, 31 Jan 2013 10:44:31 +0000 (21:44 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 31 Jan 2013 10:44:31 +0000 (21:44 +1100)
commit8ca366ebd48869569fbc18c9cd854b705e04e540
tree81391a2bab317620cff29213a6fe43fdebcdd410
parent4e6c8c5fcb1b874a8c90f5f571471ff2993ce7dc
parent9c135628c252c5655c452c7143e14461391c7799
Merge branch 'master' into mario/mutator_minstagib
qcsrc/server/cl_physics.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/t_items.qc