[vlc-commits] On the road to 2.2.0-pre1

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jun 14 17:21:16 2014 +0200| [4e2e0a4cb918c173a7543048f848d9afad0e20fb] | committer: Jean-Baptiste Kempf

On the road to 2.2.0-pre1

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=4e2e0a4cb918c173a7543048f848d9afad0e20fb
---

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

diff --git a/NEWS b/NEWS
index 5a66811..3926035 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Changes between 2.1.x and 2.2.0-git:
+Changes between 2.1.x and 2.2.0-pre1:
 --------------------------------
 
 Important changes:
diff --git a/configure.ac b/configure.ac
index a754c2d..8eecc3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,12 +2,12 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2014 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 2.2.0-git)
+AC_INIT(vlc, 2.2.0-pre1)
 VERSION_MAJOR=2
 VERSION_MINOR=2
 VERSION_REVISION=0
 VERSION_EXTRA=0
-VERSION_DEV=git
+VERSION_DEV=pre1
 
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)