]> 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: 8ac243b c525ba1)
Merge branch 'morphed/newrl' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 21 Feb 2017 10:21:35 +0000 (10:21 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 21 Feb 2017 10:21:35 +0000 (10:21 +0000)
Merge branch morphed/newrl (XS merge request)

See merge request !410


Trivial merge