Merge branch 'master' into mirceakitsune/weapon_mine_layer
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 4 Oct 2010 13:16:57 +0000 (16:16 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 4 Oct 2010 13:16:57 +0000 (16:16 +0300)
commit420ea402654a79595838c48eddea825dac892016
tree44127bb9473f0395ba1ce776f3d6a83cb829a254
parent989256c33fb1ebf1c969be74b4818d1468652879
parentc91bf811bc7585ed7f759199db0977430a6d09b0
Merge branch 'master' into mirceakitsune/weapon_mine_layer
balanceXonotic.cfg