projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fc61ce4
2d618f1
)
Merge remote branch 'refs/remotes/origin/mookow/shaderlist'
author
Rudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 20:24:59 +0000
(22:24 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 20:24:59 +0000
(22:24 +0200)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff