]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/spawnsystem_mutator
authorMario <mario.mario@y7mail.com>
Tue, 28 Jan 2014 06:16:50 +0000 (17:16 +1100)
committerMario <mario.mario@y7mail.com>
Tue, 28 Jan 2014 06:16:50 +0000 (17:16 +1100)
commitb7d32c1f333da63877913b30c861230243ce1213
tree7c8795ff50d3ae26b1306d5dd6d6da34dff6d2a0
parent8c4f7a791796098519e7dfd4e6b2aa9823c35d64
parent7e9d4404fbd602050e843cb2169f8afab4163b11
Merge branch 'master' into Mario/spawnsystem_mutator
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_spawn_near_teammate.qc