From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 13 May 2010 07:01:08 +0000 (+0300)
Subject: Merge branch 'diabolik/pyriaplayermodel' of ssh://git.xonotic.org/xonotic-data.pk3dir... 
X-Git-Tag: xonotic-v0.1.0preview~541^2~185
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=118ccbe88b886126fe05a8e2366b4a9ea42dc859;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'diabolik/pyriaplayermodel' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/newpanelhud
---

118ccbe88b886126fe05a8e2366b4a9ea42dc859