From 39da872ddaabbac9bae5449899daf373573e6d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sun, 10 Jun 2007 14:45:00 +0200
Subject: Add ChangeLog entry for the previous merge.

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 27fbf97b2..2e0274915 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@ xine-lib (1.1.90) (Unreleased)
     at the same time for Linux, and if other operating systems lacks a proper
     software mixing facility you can consider alternative daemons. Note: aRTs
     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.7)
   * Support libdca (new name for libdts) by shuffling around the dts.h file.
-- 
cgit v1.2.3