projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
328e88c
867d80e
)
Merge remote branch 'origin/fruitiex/scoreboardcolor'
author
Rudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 16:53:01 +0000
(18:53 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 16:53:01 +0000
(18:53 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff