]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6818906 32a7b29)
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
authorFruitieX <rasse@rasse-lappy.localdomain>
Tue, 15 Jun 2010 11:17:45 +0000 (14:17 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Tue, 15 Jun 2010 11:17:45 +0000 (14:17 +0300)

Trivial merge