summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2011-11-22 22:11:10 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2011-11-22 22:11:10 +0000
commit7c4077fc7906cd4774efd0e38049f52ff6579fa9 (patch)
tree74e8c7b7e8a405483cb0ef20980b19c8fc0a7904 /ChangeLog
parent720907d87e05be999f02096ef9220c2638defdc4 (diff)
parentcb766fad28e81704d6408aab27beacd976cd1731 (diff)
downloadxine-lib-7c4077fc7906cd4774efd0e38049f52ff6579fa9.tar.gz
xine-lib-7c4077fc7906cd4774efd0e38049f52ff6579fa9.tar.bz2
Merge.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 220828e1e..65fa30ad1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+xine-lib (1.1.20.1) 2011-??-??
+ * Various bug fixes.
+ * Use the current ImageMagick API (if using ImageMagick).
+
xine-lib (1.1.20) 2011-11-13
* Imagine that there's a large poppy here.
* Ensure that file and socket descriptors are marked as CLOEXEC.