]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Tue, 20 Aug 2013 17:49:39 +0000 (13:49 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 20 Aug 2013 17:49:39 +0000 (13:49 -0400)
commit5d3aed9a8ec0ff58a4f3d08d679e9ddcf8fff579
tree907e59b9778d03bd5e851a8e396738b51dde38f7
parent64e35be3ebb08e19997229b893fcd448d05e8ad3
parent23ae96654035b8cda3da563f346b4507d04d73e8
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
balanceXonotic.cfg
oldbalanceXPM.cfg
qcsrc/server/autocvars.qh
qcsrc/server/w_crylink.qc
balanceXonotic.cfg
oldbalance25.cfg
oldbalanceFruitieX.cfg
oldbalanceXDF.cfg
oldbalanceXPM.cfg
qcsrc/client/hud.qc
qcsrc/common/weapons/w_crylink.qc
qcsrc/common/weapons/w_hlac.qc
qcsrc/common/weapons/w_machinegun.qc
qcsrc/server/mutators/mutator_nades.qc