]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit1df4fb3cec6f442b521cd1f956d47c72776ada88
treea958a29fb5bf080d8654c978ae319309bd1f0a60
parent8f702ae20a0ba5fee40233c1fc8d3c03a60f982d
parent2aed36e128f8f00da9c76f9e66baae89d5bb26b2
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