Merge remote-tracking branch 'origin/master' into samual/lightning_gun
authorSamual Lenks <samual@xonotic.org>
Mon, 10 Jun 2013 01:24:23 +0000 (21:24 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 10 Jun 2013 01:24:23 +0000 (21:24 -0400)
commit9226d2a17f8329b6964cf4be5c5433e7e763c240
treeff0b28366de9d0dd1557f84b9ac3c10b98a00047
parent3ef9e333ee3efbfcbb17d7dd842655402971d291
parent72646dce0aa577090f682ed30c94509f9e3d8046
Merge remote-tracking branch 'origin/master' into samual/lightning_gun

Conflicts:
balanceLeeStricklin.cfg
balanceXonotic.cfg
qcsrc/client/hook.qc
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
15 files changed:
balance25.cfg
balanceFruitieX.cfg
balanceXPM.cfg
balanceXonotic.cfg
qcsrc/client/Defs.qc
qcsrc/client/Main.qc
qcsrc/client/hook.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src
qcsrc/server/t_quake3.qc
qcsrc/server/w_all.qc
qcsrc/server/w_electro.qc