[vlc-commits] On the road to 2.2.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jul  2 16:37:03 2013 +0200| [7c56e272ae27ca8ca35d3b50c2718bbe03ef25ef] | committer: Jean-Baptiste Kempf

On the road to 2.2.0

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

 NEWS         |    5 ++++-
 configure.ac |    8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 252fdbb..d29e0cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
-Changes between 2.0.x and 2.1.0-pre1:
+Changes between 2.1.x and 2.1.0-git:
+--------------------------------
+
+Changes between 2.0.x and 2.1.0:
 --------------------------------
 
 Important changes:
diff --git a/configure.ac b/configure.ac
index 5f42607..dc65371 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,18 +2,18 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 2.1.0-pre1)
+AC_INIT(vlc, 2.2.0-git)
 VERSION_MAJOR=2
-VERSION_MINOR=1
+VERSION_MINOR=2
 VERSION_REVISION=0
 VERSION_EXTRA=0
-VERSION_DEV=pre1
+VERSION_DEV=git
 
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="Rincewind"
+CODENAME="Weatherwax"
 COPYRIGHT_YEARS="1996-2013"
 
 AC_CONFIG_SRCDIR(src/libvlc.c)