projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
772a1a7
6dd58ef
)
Merge branch 'fruitiex/newpanelhud_stable'
author
Rudolf Polzer <divverent@alientrap.org>
Sat, 19 Jun 2010 19:08:41 +0000
(21:08 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Sat, 19 Jun 2010 19:08:41 +0000
(21:08 +0200)
Trivial merge