From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Fri, 4 Nov 2011 01:30:52 +0000 (+0100)
Subject: Moving to 1.2.0-pre1
X-Git-Tag: 1.2.0-pre1
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=49a6c7ac8d7f5f27196453e9ec582070f68422fc;hp=4039ea6f1b2c7a1244e260749c16c65d5e4b800a

Moving to 1.2.0-pre1
---

diff --git a/NEWS b/NEWS
index 7beaa872bd..20683be357 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Changes between 1.1.x and 1.2.0-git:
+Changes between 1.1.x and 1.2.0-pre1:
 ------------------------------------
 
 Important notes:
diff --git a/configure.ac b/configure.ac
index 9db6f6abba..b688d8f806 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,12 +2,12 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team])
 
-AC_INIT(vlc, 1.2.0-git)
+AC_INIT(vlc, 1.2.0-pre1)
 VERSION_MAJOR=1
 VERSION_MINOR=2
 VERSION_REVISION=0
 VERSION_EXTRA=0
-VERSION_DEV=git
+VERSION_DEV=pre1
 
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)