Merge branch 'terencehill/music_player' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 18 Jan 2015 10:42:33 +0000 (10:42 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 18 Jan 2015 10:42:33 +0000 (10:42 +0000)
commitdcf8a85693db60468fde21e1eaa64043576edb0d
treead456d0c2ef93a88d40bc8d22f6fbbb165aa8094
parent9954bbf8e7d1bea2ac1d8f8cdc279b7baa05d3e8
parentc2979f977d8f1f9c20f68447b672bc7fb732a2f5
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
defaultXonotic.cfg