]> 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 | compact (merge: 639240d 03fc803)
Merge branch 'Mario/addtolist_cleanup' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 28 Jul 2017 21:26:22 +0000 (21:26 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 28 Jul 2017 21:26:22 +0000 (21:26 +0000)
Merge branch Mario/addtolist_cleanup (XS merge request)

See merge request !452


Trivial merge