From: Mario <zacjardine@y7mail.com>
Date: Sun, 18 Jan 2015 10:42:33 +0000 (+0000)
Subject: Merge branch 'terencehill/music_player' into 'master'
X-Git-Tag: xonotic-v0.8.1~157
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dcf8a85693db60468fde21e1eaa64043576edb0d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/music_player' into 'master'

Merge branch terencehill/music_player (M merge request)

Adds a music player to the menu.

See merge request !66
---

dcf8a85693db60468fde21e1eaa64043576edb0d