summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rwxr-xr-xversion.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 24a4645a8..84996aa1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-xine-lib (1.2.?) ????-??-??
+xine-lib (1.2.6) 2014-07-06
* Add libmmal video output plugin for Raspberry Pi.
* Add libmmal HW video decoder plugin for Raspberry Pi.
* Add overlay colormatrix support.
diff --git a/version.sh b/version.sh
index 734ddf826..f76acb693 100755
--- a/version.sh
+++ b/version.sh
@@ -30,14 +30,14 @@
XINE_VERSION_MAJOR=1
XINE_VERSION_MINOR=2
-XINE_VERSION_SUB=5
+XINE_VERSION_SUB=6
XINE_VERSION_PATCH=
# Release series number (usually $XINE_MAJOR.$XINE_MINOR)
XINE_VERSION_SERIES=1.2
-XINE_LT_CURRENT=6
+XINE_LT_CURRENT=7
XINE_LT_REVISION=0
-XINE_LT_AGE=4
+XINE_LT_AGE=5
test -f "`dirname $0`/.cvsversion" && XINE_VERSION_SUFFIX="hg"
XINE_VERSION_SPEC="${XINE_VERSION_MAJOR}.${XINE_VERSION_MINOR}.${XINE_VERSION_SUB}${XINE_VERSION_PATCH}${XINE_VERSION_SUFFIX}"