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)
commit19b2166e669ed5315d9ff526c091c552bb741a37
treea3f64b239d89c2f44774ee5a757bdec2b972c26e
parentda06374c79a65b2ee34b8413fac80dd29fb64263
parent63e7ba956a09ae88f42625f96768694ff5ae1a00
Merge branch 'master' into mirceakitsune/health_size
data/defaultVT.cfg
data/qcsrc/server/vore.qc