[vlc-commits] commit: On the road to 1.1.4 (Jean-Baptiste Kempf )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Aug 25 23:02:56 2010 +0200| [8d728ffa1bfbef5430bffa78a1ace5d28a8b56f2] | committer: Jean-Baptiste Kempf 

On the road to 1.1.4

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=8d728ffa1bfbef5430bffa78a1ace5d28a8b56f2
---

 NEWS         |   10 +++++++++-
 configure.ac |    4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 16b019f..e8b3616 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
-Changes between 1.1.2 and 1.1.4-git:
+Changes between 1.1.2 and 1.1.4:
 --------------------------------
 
+Win32:
+ * Fix a security issue when loading DLLs, especially in Qt4 and dmo modules
+ * Fix folders opening from the interface
+
+Translations:
+ * Update translations for Lithuanian, Bengali, Slovak, French, Dutch, Ukranian
+   Polish, Simplified Chinese
+
 
 Changes between 1.1.2 and 1.1.3:
 --------------------------------
diff --git a/configure.ac b/configure.ac
index bfbbf0f..29fe42c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
 
-AC_INIT(vlc, 1.1.4-git)
+AC_INIT(vlc, 1.1.4)
 VERSION_MAJOR="1"
 VERSION_MINOR="1"
 VERSION_REVISION="4"
-VERSION_EXTRA="-git"
+VERSION_EXTRA=""
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)