]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Mon, 3 Oct 2011 14:57:38 +0000 (10:57 -0400)
committerSamual <samual@xonotic.org>
Mon, 3 Oct 2011 14:57:38 +0000 (10:57 -0400)
commitdf90a2b0763b3e68025a66c7c5604b7542912af8
tree4d62a6cefaf61868bb015cdafe710fa924e93bdd
parent47cb3c03c101727451165a15f301f2ff1a6f7099
parent93d9ec19ea9e08ad5d888351e1b6ef9de7364050
Merge remote branch 'origin/master' into samual/hud_updates
14 files changed:
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_minelayer.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_rifle.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_seeker.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/w_uzi.qc