]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c561750 5bbfb59)
Merge branch 'TimePath/gamemode_composition' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 24 Oct 2015 10:01:23 +0000 (10:01 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 24 Oct 2015 10:01:23 +0000 (10:01 +0000)
Gamemode composition part 1

For #1573

See merge request !244


Trivial merge