projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30c1f5c
3c9bdd5
)
Merge remote branch 'origin/diabolik/more-lavacolors'
author
tzork <jakob_mg@hotmail.com>
Tue, 1 Feb 2011 04:01:53 +0000
(
05:01
+0100)
committer
tzork <jakob_mg@hotmail.com>
Tue, 1 Feb 2011 04:01:53 +0000
(
05:01
+0100)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff