]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Thu, 31 Jan 2013 07:55:32 +0000 (02:55 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 31 Jan 2013 07:55:32 +0000 (02:55 -0500)
commit52ae1315c1851e595d12ffc13e2407dee0b24e5e
tree59cbcc69e9c6815af9755bcebaf56623c2172774
parent19ab1a2ba6824a03f8d263d27cc84dc7d54958ac
parent4b252b30e38b09fcb9bdf37673b3c567a3e5670c
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
12 files changed:
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_keepaway.qc
qcsrc/server/mutators/gamemode_keyhunt.qc
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutator_superspec.qc
qcsrc/server/progs.src
qcsrc/server/w_minstanex.qc