projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ab6e13f
b2f2ba4
)
Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3
author
Severin Meyer <sev.ch@web.de>
Thu, 11 Jun 2015 17:30:52 +0000
(19:30 +0200)
committer
Severin Meyer <sev.ch@web.de>
Thu, 11 Jun 2015 17:30:52 +0000
(19:30 +0200)
Trivial merge
projects / xonotic / xonotic.git / commitdiff