Merge branch 'master' into divVerent/csad
authorRudolf Polzer <divverent@xonotic.org>
Mon, 17 Dec 2012 16:08:50 +0000 (17:08 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 17 Dec 2012 16:08:50 +0000 (17:08 +0100)
1  2 
qcsrc/common/util.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/w_electro.qc

Simple merge
Simple merge
Simple merge