]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25255db 1323719)
Merge branch 'martin-t/gunalign' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 25 Aug 2017 11:33:33 +0000 (11:33 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 25 Aug 2017 11:33:33 +0000 (11:33 +0000)
Gunalign

See merge request !460


Trivial merge