projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
09a514b
53ec6ce
)
Merge remote branch 'origin/master' into cbrutail/shaders_fx_xonotic2
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:15:59 +0000
(12:15 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:15:59 +0000
(12:15 +0200)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff