]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/item_ammo
authorRudolf Polzer <divverent@xonotic.org>
Fri, 28 Aug 2015 14:16:59 +0000 (10:16 -0400)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 28 Aug 2015 14:16:59 +0000 (10:16 -0400)
commit8262c76e221d276dace1c4943503e6ab69efeab1
tree8e270abc27d6974cf5002ce2f1e07beda7f3d084
parent85917474b9222c8b4eff50e246fb2688938e528b
parente9c9fda4a8d7356d101316ea3050c84b0daf9b47
Merge branch 'master' into divVerent/item_ammo
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/t_quake3.qc