Merge remote branch 'origin/fruitiex/glowmodreset'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 4 Dec 2010 15:23:38 +0000 (16:23 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 4 Dec 2010 15:23:38 +0000 (16:23 +0100)
commit16496d2a82fba46621a4096a9de394ef400c0b1e
tree1553da07bf9e617297ef4f13fe9fe23bc62d2836
parentd7a834f0cfbf327e001d53f09c7ddfe2e2783955
parent62bebaf30849a5415958d844237e182246a36aeb
Merge remote branch 'origin/fruitiex/glowmodreset'

Conflicts:
qcsrc/server/w_nex.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/w_nex.qc