Merge branch 'morphed/hpitems' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
authorMorphed <Morphed@o2.pl>
Wed, 30 Mar 2011 21:38:48 +0000 (23:38 +0200)
committerMorphed <Morphed@o2.pl>
Wed, 30 Mar 2011 21:38:48 +0000 (23:38 +0200)
commit9df92eba777ae4365b46b0eb61fe315d91ed9388
treed96ec872ed1a799738eeac54f6fd5a89f3aeed1f
parent175676acff258066f5f61e6044327fabb448a309
parent5a682c6eb030594b9cc2cf652dd5ab98475095db
Merge branch 'morphed/hpitems' of ssh://git.xonotic.org/xonotic-data.pk3dir into morphed/hpitems