]> 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: 8f702ae 2aed36e)
Merge branch 'Mario/minigames_merge' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 24 Aug 2015 09:10:04 +0000 (09:10 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 24 Aug 2015 09:10:04 +0000 (09:10 +0000)
Merge branch Mario/minigames_merge (L merge request)

Minigame system by Melanosuchus, about time this fine piece of work made its way into the main game.

See merge request !202


Trivial merge