summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-06-12 22:32:26 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-06-12 22:32:26 +0100
commit58d9467d1b2188463b216b79b51a423559e97a75 (patch)
tree233624f3ae7213c376b6b293160b153061ed7e43 /ChangeLog
parentaba1fd253b3a2c5cfa13e13eefea469e4e3dff9b (diff)
parent125e98b02c9d62e09e154f176aacc2b9c51fd164 (diff)
downloadxine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.gz
xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.bz2
A nice simple merge from 1.1.
Hopefully, I've applied all of the $(LTLIBINTL) changes correctly...
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2acd3e45e..f205af39b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,8 @@ xine-lib (1.1.90) (Unreleased)
will not be present in KDE 4.
* Convert the FAQ and the Hacker's Guide from DocBook SGML to DocBook 4.4
XML, and the figures from fig files to SVG files.
+
+xine-lib (1.1.8) (Unreleased)
* Send a channel changed event to the frontend when receiving the SYNC
string from last.fm streaming server.