projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cecc7e1
8acd2f6
)
Merge remote branch 'refs/remotes/origin/tzork/terrain01x'
author
Rudolf Polzer <divverent@alientrap.org>
Mon, 9 Aug 2010 05:00:38 +0000
(07:00 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Mon, 9 Aug 2010 05:00:38 +0000
(07:00 +0200)
Conflicts:
scripts/shaderlist.txt
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff