]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 316b99c 9b6857c)
Merge remote-tracking branch 'origin/samual/spawn_weapons' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Mon, 10 Jun 2013 01:56:24 +0000 (21:56 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 10 Jun 2013 01:56:24 +0000 (21:56 -0400)
commit8675941fb13c2d91b62332c58d9e9d8da6b47524
tree987204b73804830a70a21d68a80e03f24370387atree | snapshot
parent316b99cb8eadb3f99c357ffb628002f50f89484fcommit | diff
parent9b6857c58d8cbda91460b1a55ba48383e49ccd35commit | diff
Merge remote-tracking branch 'origin/samual/spawn_weapons' into samual/weapons

Conflicts:
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/progs.src
13 files changed:
balance25.cfg diff1 | diff2 | blob | history
balanceFruitieX.cfg diff1 | diff2 | blob | history
balanceXPM.cfg diff1 | diff2 | blob | history
balanceXonotic.cfg diff1 | diff2 | blob | history
qcsrc/client/Defs.qc diff1 | diff2 | blob | history
qcsrc/client/Main.qc diff1 | diff2 | blob | history
qcsrc/client/hook.qc diff1 | diff2 | blob | history
qcsrc/common/constants.qh diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc diff1 | diff2 | blob | history
qcsrc/server/g_world.qc diff1 | diff2 | blob | history
qcsrc/server/progs.src diff1 | diff2 | blob | history
qcsrc/server/w_electro.qc diff1 | diff2 | blob | history