Merge branch 'master' into div0/funguns-nonff div0/funguns-nonff
authorRudolf Polzer <rpolzer@grawp.div0.qc.to>
Fri, 26 Feb 2010 20:45:41 +0000 (21:45 +0100)
committerRudolf Polzer <rpolzer@grawp.div0.qc.to>
Fri, 26 Feb 2010 20:45:41 +0000 (21:45 +0100)
1  2 
data/balance.cfg
data/balance25.cfg
data/balanceHavoc.cfg
data/balanceNexrun.cfg
data/balanceSamual.cfg
data/defaultNexuiz.cfg
data/qcsrc/client/View.qc
data/qcsrc/client/projectile.qc
data/qcsrc/common/constants.qh
data/qcsrc/server/t_items.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge