]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da7fcbf 288dfde)
Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 9 Jun 2010 20:26:06 +0000 (23:26 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 9 Jun 2010 20:26:06 +0000 (23:26 +0300)

Trivial merge