[poppler] poppler: ChangeLog,1.210,1.211

[Albert Astals Cid]

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

Modified Files:
	ChangeLog 
Log Message:
Merge GlobalParam.* changes, they are worthless for us as poppler but this way we are nearer to have the 3.01 sources merged, then we can remove them if we decide we don't need this options.
Remove a setEncryption from the Xref.h marco probably forgot to remove when merging


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- ChangeLog	20 Sep 2005 13:23:08 -0000	1.210
+++ ChangeLog	20 Sep 2005 14:00:43 -0000	1.211
@@ -1,3 +1,6 @@
+2005-09-20  Albert Astals Cid  <aacid at kde.org>
+	* poppler/GlobalParams.[cc|h]: Merge from xpdf 3.01
+
 2005-09-20  Marco Pesenti Gritti  <mpg at redhat.com>
 
 	* poppler/XRef.cc: