summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-07 17:03:08 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-07 17:03:08 +0000
commit8619a3368fb968b6416025e11009a09268352987 (patch)
tree5c296a6d6dabb726cd394753b1876ebc2a54d7ad
parent4525eb5c24036ef0c5bfb9a7f3462bca830c53a7 (diff)
parent3f9f65fc0d816a77bff17c8ad001d174a7e68fc3 (diff)
downloadxine-lib-8619a3368fb968b6416025e11009a09268352987.tar.gz
xine-lib-8619a3368fb968b6416025e11009a09268352987.tar.bz2
Merge release from 1.1.
-rw-r--r--.hgtags1
-rw-r--r--ChangeLog4
2 files changed, 4 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index c6dc8b93b..ac9f481e2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -77,3 +77,4 @@ ffe7962edb79c2ed967b82a82ccfb2ac7eb148a2 vdr-xine-version-802
492f87e6963a8d244df32c40d66a6349aabc4420 xine-lib-1_1_13-release
9b383441a18fb49ccd5a07465d3e3db8821cccf6 xine-lib-1_1_14-release
17f8ed16524ba779af42913e51667e89b83a1887 xine-lib-1_1_15-release
+e33280bcaa3b1f3f5b93e633e2225e2440ecfd7c xine-lib-1_1_16-release
diff --git a/ChangeLog b/ChangeLog
index 45c6e5798..159d05670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,7 +68,9 @@ xine-lib (1.1.90) (Unreleased)
* Report more video output capabilities via (port)->get_capabilities():
colour controls, zooming, colour keying.
-xine-lib (1.1.16) 2008-??-??
+xine-lib (1.1.17) 2009-??-??
+
+xine-lib (1.1.16) 2009-01-07
* Security fixes:
- Heap overflow in Quicktime atom parsing. (CVE-2008-5234)
- Multiple buffer overflows. (CVE-2008-5236)