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)
commit6d249c399e3e08bac4f671d875e1a58ba52a5a34
tree275fac8bc38cf1a5413b7e70327629ab07f05845
parent24f341e88c43d52141da8bc22459d3d67b2c45a1
parentfa6062cabfcccc5412e8caa9ebb0e955cf46456c
Merge branch 'master' into divVerent/csad
qcsrc/common/util.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/w_electro.qc