projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3c4a446
c0c5970
)
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
author
FruitieX <rasse@rasse-lappy.localdomain>
Wed, 14 Jul 2010 17:23:57 +0000
(20:23 +0300)
committer
FruitieX <rasse@rasse-lappy.localdomain>
Wed, 14 Jul 2010 17:23:57 +0000
(20:23 +0300)
Trivial merge