projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
222228f
69d729d
)
Merge remote branch 'origin/terencehill/newpanelhud' into fruitiex/newpanelhud
author
FruitieX <rasse@rasse-lappy.localdomain>
Thu, 17 Jun 2010 08:48:35 +0000
(11:48 +0300)
committer
FruitieX <rasse@rasse-lappy.localdomain>
Thu, 17 Jun 2010 08:48:35 +0000
(11:48 +0300)
Trivial merge