Merge branch 'master' into mirceakitsune/health_size
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 2 May 2011 17:09:39 +0000 (20:09 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 2 May 2011 17:09:39 +0000 (20:09 +0300)
1  2 
data/defaultVT.cfg
data/qcsrc/server/vore.qc

Simple merge
Simple merge