]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/rifle_arena
authorMario <mario.mario@y7mail.com>
Wed, 5 Jun 2013 00:01:07 +0000 (10:01 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 5 Jun 2013 00:01:07 +0000 (10:01 +1000)
commit4addeeaa4a26b9482367dcb140a8909b7c2884d8
tree67c36af4d55a5a98fd315202989e389b9cb1cf90
parentcc290b38c89cc6e01d046dca8212012ab1b71e4d
parentce0e9fc6d8f48efc4f497f43e313eb2361c0b2ce
Merge branch 'master' into Mario/rifle_arena
defaultXonotic.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_physics.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_dodging.qh