projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dfbb931
abda1f2
)
Merge remote branch 'origin/fruitiex/lightshaders'
author
Rudolf Polzer <divVerent@alientrap.org>
Tue, 24 Aug 2010 09:39:27 +0000
(11:39 +0200)
committer
Rudolf Polzer <divVerent@alientrap.org>
Tue, 24 Aug 2010 09:39:27 +0000
(11:39 +0200)
Trivial merge