From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun, 29 Mar 2009 17:23:14 +0000 (+0200)
Subject: Merge branch 'master' of git@git.videolan.org:vlc
X-Git-Tag: 1.0.0-pre2~328
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1c56e0ed3e363aa8c581c7e2880ac3e9bc51c674;hp=5b963efaee9e31f6617061e24317b4c8ed7964e1;p=vlc

Merge branch 'master' of git@git.videolan.org:vlc
---

diff --git a/modules/demux/playlist/ram.c b/modules/demux/playlist/ram.c
index d640c7ac22..57f94198b9 100644
--- a/modules/demux/playlist/ram.c
+++ b/modules/demux/playlist/ram.c
@@ -51,6 +51,8 @@ http://service.real.com/help/library/guides/realone/IntroGuide/HTML/htmfiles/ram
 #include <vlc_demux.h>
 #include <vlc_charset.h>
 
+#include <ctype.h>
+
 #include "playlist.h"
 
 struct demux_sys_t
diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index fb9dd8b11d..a3d458891c 100644
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -399,6 +399,7 @@ void DialogsProvider::addFromSimple( bool pl, bool go)
 {
     QStringList files = DialogsProvider::showSimpleOpen();
     int i = 0;
+	files.sort();
     foreach( const QString &file, files )
     {
         playlist_Add( THEPL, qtu( toNativeSeparators( file ) ), NULL,