From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 13 Apr 2010 00:14:20 +0000 (+0200)
Subject: The next major release of VLC after 1.1.0 will be 1.2.0
X-Git-Tag: 1.2.0-pre1~7081
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8a163fec68bf7c0ba8da066767e9aac42a4194b9;p=vlc

The next major release of VLC after 1.1.0 will be 1.2.0
---

diff --git a/NEWS b/NEWS
index af61a20823..fe46048143 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Changes between 1.1.0 and 1.2.0-git:
+------------------------------------
+
 Changes between 1.0.5 and 1.1.0-pre1:
 ------------------------------------
 Important changes for users:
diff --git a/configure.ac b/configure.ac
index 27a05b8908..e51943c3eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,16 +2,16 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
 
-AC_INIT(vlc, 1.1.0-pre1)
+AC_INIT(vlc, 1.2.0-git)
 VERSION_MAJOR="1"
-VERSION_MINOR="1"
+VERSION_MINOR="2"
 VERSION_REVISION="0"
-VERSION_EXTRA="-pre1"
+VERSION_EXTRA="-git"
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="The Luggage"
+CODENAME="Twoflower"
 COPYRIGHT_YEARS="1996-2010"
 
 AC_PREREQ(2.59c)