]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/item_ammo
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 9 Feb 2015 12:10:36 +0000 (13:10 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 9 Feb 2015 12:10:36 +0000 (13:10 +0100)
commit85917474b9222c8b4eff50e246fb2688938e528b
tree4153b1f9b5b27d84a28ca74448c2ba0bb8dafe58
parent416f8cd1a77bd40a84f0393866435de25f5718dd
parentf2c50fe4e6218a0a1bb0ca078ee122c5ba6a238d
Merge branch 'master' into divVerent/item_ammo

Conflicts:
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/t_quake3.qc
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