Merge branch 'diabolik/pyriaplayermodel' of ssh://git.xonotic.org/xonotic-data.pk3dir...
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 13 May 2010 07:01:08 +0000 (10:01 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 13 May 2010 07:01:08 +0000 (10:01 +0300)
commit118ccbe88b886126fe05a8e2366b4a9ea42dc859
treec5e9e37b50c23bf55f72f393e40dfc6c7e680fb9
parentaba4266c081aebb25863c81f8625ce9543b93faa
parent55efb79e5ec7a28c82b3d014cd443e72145dd24f
Merge branch 'diabolik/pyriaplayermodel' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/newpanelhud
defaultXonotic.cfg
qcsrc/client/Main.qc