Merge branch 'master' into mirceakitsune/weapon_mine_layer
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 2 Oct 2010 12:45:48 +0000 (15:45 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 2 Oct 2010 12:45:48 +0000 (15:45 +0300)
1  2 
qcsrc/server/defs.qh

Simple merge