[vlc-commits] Happy New Year

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan  2 01:00:51 2012 +0100| [82312b8e9a56a3dd8a557c71815a858505d12cad] | committer: Jean-Baptiste Kempf

Happy New Year

(cherry picked from commit c7fd79264f42ff8a6c7ac65fddb77f476d7ca1e7)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=82312b8e9a56a3dd8a557c71815a858505d12cad
---

 configure.ac    |    4 ++--
 doc/Makefile.am |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0c0324c..d138504 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_COPYRIGHT([Copyright 2002-2011 VLC authors and VideoLAN])
+AC_COPYRIGHT([Copyright 2002-2012 VLC authors and VideoLAN])
 
 AC_INIT(vlc, 1.2.0-rc1)
 VERSION_MAJOR=1
@@ -14,7 +14,7 @@ AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Twoflower"
-COPYRIGHT_YEARS="1996-2011"
+COPYRIGHT_YEARS="1996-2012"
 
 AC_CONFIG_SRCDIR(src/libvlc.c)
 AC_CONFIG_AUX_DIR(autotools)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3db7d5b..0db536a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -33,6 +33,7 @@ CHANGELOGS = \
 	ChangeLog-2009 \
 	ChangeLog-2010 \
 	ChangeLog-2011 \
+	ChangeLog-2012 \
 	$(NULL)
 
 man1_MANS = \