r15320 | zorglub | 2006-04-23 13:49:43 +0200 (Sun, 23 Apr 2006) | 2 lines Changed paths: M /branches/0.8.6-playlist-vlm Fix conflict -- This is the vlc-devel mailing-list, see http://www.videolan.org/vlc/ To unsubscribe, please read http://developers.videolan.org/lists.html