[vlc-commits] Moving to 1.2.0-pre1

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Nov  4 02:30:52 2011 +0100| [506bb385a5bced95e041bdc613005c950df93904] | committer: Jean-Baptiste Kempf

Moving to 1.2.0-pre1

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=506bb385a5bced95e041bdc613005c950df93904
---

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

diff --git a/NEWS b/NEWS
index 7beaa87..20683be 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 9db6f6a..b688d8f 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)