Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir...
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 May 2010 17:04:15 +0000 (19:04 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 May 2010 17:04:15 +0000 (19:04 +0200)
commit6b912e45d2d729fb157d3caebd6587a90c43d166
tree498cdf86f1c789e29a4ee664ac9da55e08ae56f2
parentf1c693d2b2b47190c6ce08941a5701773c136c10
parente7cea568e10cdfdea03fee64c2985fd51e9a9b47
Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/newpanelhud