[poppler] poppler: ChangeLog,1.220,1.221

[Albert Astals Cid]

Update of /cvs/poppler/poppler
In directory gabe:/tmp/cvs-serv26648

Modified Files:
	ChangeLog 
Log Message:
Merge SplashFTFont.cc with xpdf 3.01 changes


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- ChangeLog	16 Oct 2005 14:25:32 -0000	1.220
+++ ChangeLog	16 Oct 2005 14:30:16 -0000	1.221
@@ -1,6 +1,7 @@
 2005-09-20  Albert Astals Cid  <aacid at kde.org>
 	* splash/SplashXPathScanner.cc: Merge from xpdf 3.01
 	* splash/SplashScreen.[cc|h]: Merge from xpdf 3.01
+	* splash/SplashFTFont.cc: Merge from xpdf 3.01
 	
 2005-10-05  Kristian Høgsberg  <krh at redhat.com>