projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e712295
b2ca5b5
)
Merge branch 'Mario/glx_build' into 'master'
author
Mario <zacjardine@y7mail.com>
Sun, 18 Aug 2019 08:10:48 +0000
(08:10 +0000)
committer
Mario <zacjardine@y7mail.com>
Sun, 18 Aug 2019 08:10:48 +0000
(08:10 +0000)
Merge branch Mario/glx_build (M merge request)
See merge request xonotic/xonotic!53
Trivial merge