[vlc-commits] On the road to 2.2.2

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Apr 14 15:51:12 2015 +0200| [84ee1ed2343351d1128641315eb26ac72d16e6bc] | committer: Jean-Baptiste Kempf

On the road to 2.2.2

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

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

diff --git a/NEWS b/NEWS
index 241fde4..12903a4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Changes between 2.2.1 and 2.2.2:
+--------------------------------
+
+
 Changes between 2.2.0 and 2.2.1:
 --------------------------------
 
diff --git a/configure.ac b/configure.ac
index 121e8c9..35fb2df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,10 +2,10 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 1999-2015 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 2.2.1)
+AC_INIT(vlc, 2.2.2)
 VERSION_MAJOR=2
 VERSION_MINOR=2
-VERSION_REVISION=1
+VERSION_REVISION=2
 VERSION_EXTRA=0
 VERSION_DEV=
 
@@ -13,7 +13,7 @@ PKGDIR="vlc"
 AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="Terry Pratchett (Weatherwax)"
+CODENAME="Weatherwax"
 COPYRIGHT_YEARS="1996-2015"
 
 AC_CONFIG_SRCDIR(src/libvlc.c)