git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

Merge branch 'Mario/rifle_arena' into Mario/mutators

mutators.cfg	diff1 \|	\|	blob \| history
qcsrc/client/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_freezetag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_riflearena.qc	\|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history