projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c52527c
2397776
)
Merge branch 'master' into mirio/geoplanetary
author
Mirio <opivy@hotmail.de>
Mon, 16 Mar 2015 14:18:18 +0000
(15:18 +0100)
committer
Mirio <opivy@hotmail.de>
Mon, 16 Mar 2015 14:18:18 +0000
(15:18 +0100)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff