projects
/
xonotic
/
mediasource.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a970ce9
521ac9f
)
Merge remote branch 'origin/fruitiex/wickedhud'
author
Rudolf Polzer <divverent@alientrap.org>
Sat, 19 Jun 2010 19:22:01 +0000
(21:22 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Sat, 19 Jun 2010 19:22:01 +0000
(21:22 +0200)
Trivial merge