summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-11 08:50:49 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-11 08:50:49 +0200
commit43a678e5083b25f3fd6f16bc805aea2b09690491 (patch)
treeafe9f461a5aa3e577fee2df29d32d561b76c5e74 /ChangeLog
parent746fe564619e6bfabc496e01519e69f5c0d76177 (diff)
parent2cf4445f446410a072d90a2aca84d3b61bb9d5cf (diff)
downloadxine-lib-43a678e5083b25f3fd6f16bc805aea2b09690491.tar.gz
xine-lib-43a678e5083b25f3fd6f16bc805aea2b09690491.tar.bz2
Merge 1.1 branch.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e3ace07b..14547988f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,10 @@ xine-lib (1.1.90) (Unreleased)
sources; this allows to enable/disable FFmpeg features easily, and allow
to properly support --disable-ffmpeg-(uncommon|popular)-codecs.
-xine-lib (1.1.5) (Unreleased)
+xine-lib (1.1.6) [UNRELEASED]
+ * Split the DirectFB plugin into X11 and non-X versions.
+
+xine-lib (1.1.5)
* Security fixes:
- Fix heap overflow in DMO loader. (CVE-2007-1246) [bug #1676925]
Thanks to Kees Cook for reporting.