projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7d84b78
a602049
)
Merge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'
author
Rudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 21:32:37 +0000
(23:32 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 21:32:37 +0000
(23:32 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff