]> 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: 9954bbf c2979f9)
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)
Merge branch terencehill/music_player (M merge request)

Adds a music player to the menu.

See merge request !66

1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge