summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-01 17:56:10 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-01 17:56:10 +0000
commit2b70763448215157ea70d03802e07d9f55750736 (patch)
tree07dc9d0fae7adac6a76893a76a2e3a46c1d48408
parentec02c795c9511d832b2034a5ce55c1709152b9c7 (diff)
parentf0fed5bcc050d947a1d41f742acf111f3f1c0b2b (diff)
downloadxine-lib-2b70763448215157ea70d03802e07d9f55750736.tar.gz
xine-lib-2b70763448215157ea70d03802e07d9f55750736.tar.bz2
Merge from 1.1.
-rw-r--r--.hgtags1
-rw-r--r--ChangeLog4
2 files changed, 3 insertions, 2 deletions
diff --git a/.hgtags b/.hgtags
index a70b2028c..77b5be60c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -160,3 +160,4 @@ ff764395a361257b11d73583a0e0851e0f5f2ee5 1.1.17
8b7c25bfb056ee9b907877b462c132e61112e440 1.1.18.1
acba7a8c29cca74b112c2c6db4310ddeb1524696 1.1.19
342128b2fcf59bfe8844b282a228581aa8bbbbde 1.1.20
+dde68fe11b973767f0b743ced2b41a244e1e0b78 1.1.20.1
diff --git a/ChangeLog b/ChangeLog
index 487f6e529..3f6cd8b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,12 +75,12 @@ xine-lib (1.1.21) 2011-??-??
* Improved syncing of DVB subtitles
* BluRay support (requires libbluray)
-xine-lib (1.1.20.1) 2011-??-??
+xine-lib (1.1.20.1) 2012-01-01
* Various bug fixes.
* Use the current ImageMagick API (if using ImageMagick).
* Fix PVR plugin input building (needs V4L2).
* Fixes related to unknown audio & subtitle languages.
- * Memory leak fixes
+ * Memory leak fixes.
xine-lib (1.1.20) 2011-11-13
* Imagine that there's a large poppy here.