From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 28 Nov 2011 00:13:20 +0000 (+0100)
Subject: On the road of 1.3.0
X-Git-Tag: 1.3.0-git^0
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5f4bb6a9e20e3860707229c31b9d1b83d4ec6732;p=vlc

On the road of 1.3.0
---

diff --git a/NEWS b/NEWS
index 2827bca60e..21b9ab497d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
-Changes between 1.1.x and 1.2.0-pre2:
-------------------------------------
+Changes between 1.2.x and 1.3.0:
+--------------------------------
+
+
+
+Changes between 1.1.12 and 1.2.0:
+---------------------------------
 
 Important notes:
  * Start/end titles/chapters are now specified with # rather than @ to fix
diff --git a/configure.ac b/configure.ac
index 9344af9a35..294c3ef855 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,19 @@
 dnl Autoconf settings for vlc
 
-AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team])
+AC_COPYRIGHT([Copyright 2002-2011 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 1.2.0-pre2)
+AC_INIT(vlc, 1.3.0-git)
 VERSION_MAJOR=1
-VERSION_MINOR=2
+VERSION_MINOR=3
 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="Twoflower"
+CODENAME="Rincewind"
 COPYRIGHT_YEARS="1996-2011"
 
 AC_CONFIG_SRCDIR(src/libvlc.c)