projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6ad6e3c
5f1bee7
)
Merge branch 't0uYK8Ne/finalrage' into 'master'
author
Mirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:19:46 +0000
(20:19 +0000)
committer
Mirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:19:46 +0000
(20:19 +0000)
t0uYK8Ne/finalrage
See merge request !69
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff