Merge branch 'v0.18.x'

2014-07-11 21:33:50 +02:00
parent 681643ea9e ecb67a1ed1
commit 828cd6fd0b
12 changed files with 148 additions and 33 deletions
--- a/src/queue/PlaylistControl.cxx
+++ b/src/queue/PlaylistControl.cxx
@@ -153,7 +153,7 @@ playlist::PlayNext(PlayerControl &pc)
 			queue.ShuffleOrder();

 			/* note that current and queued are
-			   now invalid, but playlist_play_order() will
+			   now invalid, but PlayOrder() will
 			   discard them anyway */
 		}