On the road to 2.2.0

7c56e272 · Jean-Baptiste Kempf · ac636ade · 7c56e272 · 7c56e272
Commit 7c56e272 authored Jul 02, 2013 by Jean-Baptiste Kempf
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

NEWS NEWS +4 -1

configure.ac configure.ac +4 -4

No files found.
--- a/NEWS
+++ b/NEWS
-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:

--- 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)