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

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jul 20 13:36:40 2010 +0200| [82c39393d637001cf83b604fdeec29cf191b8b74] | committer: Jean-Baptiste Kempf 

On the road to 1.1.2

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

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

diff --git a/NEWS b/NEWS
index 63f783c..cc91dc8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Changes between 1.1.1 and 1.1.2-git
+--------------------------------
+
+
 Changes between 1.1.0 and 1.1.1:
 --------------------------------
 
diff --git a/configure.ac b/configure.ac
index ec32a93..1a8240a 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.1)
+AC_INIT(vlc, 1.1.2-git)
 VERSION_MAJOR="1"
 VERSION_MINOR="1"
-VERSION_REVISION="1"
-VERSION_EXTRA=""
+VERSION_REVISION="2"
+VERSION_EXTRA="-git
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)