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

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Nov 13 19:39:58 2010 +0100| [264eb6d145507c0e6f152ce86cd26441bc4156d6] | committer: Jean-Baptiste Kempf 

On the road to 1.1.6

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

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

diff --git a/NEWS b/NEWS
index 72ea2ee..ea7740b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,13 @@
+Changes between 1.1.5 and 1.1.6-git:
+---------------------------------
+
+
+
 Changes between 1.1.4.1 and 1.1.5:
 ----------------------------------
 
 Security:
- * Fix a Windows crash on accessing Network Shared files/drives, 
+ * Fix a Windows crash on accessing Network Shared files/drives,
    VideoLAN-SA-1006
 
 Access:
@@ -45,6 +50,7 @@ Translations:
  * Major update and activation on Windows of Modern Greek
  * New Asturian translation
 
+
 Changes between 1.1.4 and 1.1.4.1:
 ----------------------------------
 
diff --git a/configure.ac b/configure.ac
index 0ce7a88..d4f6121 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.5)
+AC_INIT(vlc, 1.1.6-git)
 VERSION_MAJOR="1"
 VERSION_MINOR="1"
-VERSION_REVISION="5"
-VERSION_EXTRA=""
+VERSION_REVISION="6"
+VERSION_EXTRA="-git"
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)