From: Mario <zacjardine@y7mail.com>
Date: Mon, 24 Aug 2015 09:10:04 +0000 (+0000)
Subject: Merge branch 'Mario/minigames_merge' into 'master'
X-Git-Tag: xonotic-v0.8.2~2038
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1df4fb3cec6f442b521cd1f956d47c72776ada88;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/minigames_merge' into 'master'

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
---

1df4fb3cec6f442b521cd1f956d47c72776ada88