projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
950c84e
bd3f704
)
Merge remote branch 'origin/diabolik/stein1x'
author
tzork <jakob_mg@hotmail.com>
Sat, 5 Feb 2011 11:43:41 +0000
(12:43 +0100)
committer
tzork <jakob_mg@hotmail.com>
Sat, 5 Feb 2011 11:43:41 +0000
(12:43 +0100)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff