Merge branch 'v0.18.x' into v0.19.x

2015-01-26 20:47:27 +01:00
parent 023b9c1e7e ad1b6ef0ac
commit a289dcb9ee
16 changed files with 10 additions and 839 deletions
--- a/3
+++ b/3
@@ -116,9 +116,6 @@ For WavPack playback.
 libadplug - http://adplug.sourceforge.net/
 For AdLib playback.

-despotify - https://github.com/SimonKagstrom/despotify
-For Spotify playback.
-

 Optional Miscellaneous Dependencies
 -----------------------------------