summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2010-01-26 02:05:39 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2010-01-26 02:05:39 +0000
commitaba6adc0529ceed3406faabdc682efab035ef5ca (patch)
tree7d9ab537c721cc0f8d218a08e91cf7a3b9bb7f01 /ChangeLog
parentdcc02769693d66bbb703b082c3cde9174ade4a37 (diff)
parent7a6f9b2927283b12d3438ad4fc60054650ac1554 (diff)
downloadxine-lib-aba6adc0529ceed3406faabdc682efab035ef5ca.tar.gz
xine-lib-aba6adc0529ceed3406faabdc682efab035ef5ca.tar.bz2
Merge from 1.1.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 50a240d43..3ad813221 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,7 +69,7 @@ xine-lib (1.1.90) (Unreleased)
* Report more video output capabilities via (port)->get_capabilities():
colour controls, zooming, colour keying.
-xine-lib (1.1.1?) 20??-??-??
+xine-lib (1.1.18) 20??-??-??
* Bump the FLAC decoder's priority above ffmpegaudio. This should fix
various problems with FLAC playback.
* Build fix (undefined symbol) for when using older ffmpeg.