Merge remote-tracking branch 'origin/terencehill/music_player' into terencehill/music...
authorterencehill <piuntn@gmail.com>
Tue, 6 Aug 2013 00:24:47 +0000 (02:24 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 6 Aug 2013 00:24:47 +0000 (02:24 +0200)
commit46227d344e48c3a06cf4a736046103722adb82f2
tree6cadca7eea4a3e070b7cd243d4504dbbf11e3bf6
parentecf04f035024edeb4d143e1e3d3df5fea2153903
parent2a3c3eecb6b49f6afd37fc8d1be3e3c68462e6aa
Merge remote-tracking branch 'origin/terencehill/music_player' into terencehill/music_player

Conflicts:
qcsrc/menu/xonotic/playlist.c