[poppler] poppler: ChangeLog,1.221,1.222

[Albert Astals Cid]

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

Modified Files:
	ChangeLog 
Log Message:
Annot.[cc|h] and related merges from xpdf 3.01


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- ChangeLog	16 Oct 2005 14:30:16 -0000	1.221
+++ ChangeLog	16 Oct 2005 14:54:17 -0000	1.222
@@ -1,7 +1,12 @@
-2005-09-20  Albert Astals Cid  <aacid at kde.org>
+2005-10-16  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
+	* poppler/Annot.[cc|h]: Merge from xpdf 3.01
+	* poppler/FontInfo.cc
+	* poppler/Page.cc:
+	* poppler/PSOutputDev.cc: Changes needed due to Annot changes
+	
 	
 2005-10-05  Kristian Høgsberg  <krh at redhat.com>