summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-01 17:57:55 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-01 17:57:55 +0000
commit7cc8a40b91c0fe30189c595a6826109ac2f324ee (patch)
tree8298fe09fa618d1595398bef125dcf2c355c05c9
parent2b70763448215157ea70d03802e07d9f55750736 (diff)
downloadxine-lib-7cc8a40b91c0fe30189c595a6826109ac2f324ee.tar.gz
xine-lib-7cc8a40b91c0fe30189c595a6826109ac2f324ee.tar.bz2
xine-lib 1.2.0, and about time too!
-rw-r--r--ChangeLog2
-rwxr-xr-xversion.sh4
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