projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
05bf7f6
d03d329
)
Merge branch 'matthiaskrgr/srgb' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir...
author
Mirio <opivy@hotmail.de>
Fri, 4 Sep 2015 14:51:53 +0000
(16:51 +0200)
committer
Mirio <opivy@hotmail.de>
Fri, 4 Sep 2015 14:51:53 +0000
(16:51 +0200)
Trivial merge