projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d271f27
c914a05
)
Merge branch 'master' into terencehill/translate_colors_2
290/head
author
terencehill <piuntn@gmail.com>
Sun, 1 May 2016 10:48:52 +0000
(12:48 +0200)
committer
terencehill <piuntn@gmail.com>
Sun, 1 May 2016 10:48:52 +0000
(12:48 +0200)
Trivial merge