Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual <samual@xonotic.org>
Thu, 24 May 2012 16:09:09 +0000 (12:09 -0400)
committerSamual <samual@xonotic.org>
Thu, 24 May 2012 16:09:09 +0000 (12:09 -0400)
commitcfdec7de4f6fff90a2142be820eaeb43a5f7f572
treeac8b57d0632601d55a538bf92a41506b8f90315f
parent385f53e7ad57423222659adc7d8e5e30489f8880
parente55b0af41ff296efc886dfaccf3f663f751f6502
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons

Conflicts:
effectinfo.txt
qcsrc/common/util.qc
qcsrc/common/util.qh
balanceXonotic.cfg
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/autocvars.qh
qcsrc/server/w_common.qc