From 7cc8a40b91c0fe30189c595a6826109ac2f324ee Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sun, 1 Jan 2012 17:57:55 +0000
Subject: xine-lib 1.2.0, and about time too!

---
 ChangeLog  | 2 +-
 version.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f6cd8b63..f190dde62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-xine-lib (1.1.90) (Unreleased)
+xine-lib (1.2.0) 2012-01-01
   * Add support for VDR.
   * Add support for VDPAU.
   * xine-config is deprecated in favour of pkg-config libxine.
diff --git a/version.sh b/version.sh
index 9db0b1562..d0a204cef 100755
--- a/version.sh
+++ b/version.sh
@@ -29,8 +29,8 @@
 #   XINE_LT_AGE         the number of previous API versions still supported
 
 XINE_VERSION_MAJOR=1
-XINE_VERSION_MINOR=1
-XINE_VERSION_SUB=90
+XINE_VERSION_MINOR=2
+XINE_VERSION_SUB=0
 XINE_VERSION_PATCH=
 # Release series number (usually $XINE_MAJOR.$XINE_MINOR)
 XINE_VERSION_SERIES=1.2
-- 
cgit v1.2.3