[vlc-commits] commit: Put 1.1.5-git as version for VLC 1.1.x branch (Jean-Baptiste Kempf )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Sep 29 12:35:21 2010 +0200| [1a64f81baf4a88373b3a9d0071c9a23a34efd262] | committer: Jean-Baptiste Kempf 

Put 1.1.5-git as version for VLC 1.1.x branch

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

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

diff --git a/NEWS b/NEWS
index 10767dd..37d1233 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Changes between 1.1.4.1 and 1.1.5-git:
+----------------------------------
+
+
 Changes between 1.1.4 and 1.1.4.1:
 ----------------------------------
 
@@ -18,6 +22,7 @@ Translations:
  * Update translations for Dutch, Estonian, Lithuanian, Japanese, Nynorsk,
    Brazillian Portuguese, Armenian, Wallon
 
+
 Changes between 1.1.3 and 1.1.4:
 --------------------------------
 
diff --git a/configure.ac b/configure.ac
index fcfd808..775135d 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.1)
+AC_INIT(vlc, 1.1.5-git)
 VERSION_MAJOR="1"
 VERSION_MINOR="1"
-VERSION_REVISION="4"
-VERSION_EXTRA=".1"
+VERSION_REVISION="5"
+VERSION_EXTRA="-git"
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)