[poppler] poppler: ChangeLog,1.248,1.249

[Albert Astals Cid]

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

Modified Files:
	ChangeLog 
Log Message:
Fix error in merging CAN-2005-3193 fix. Thanks Daniel Gryniewicz for notifying


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- ChangeLog	4 Dec 2005 11:30:00 -0000	1.248
+++ ChangeLog	4 Dec 2005 18:53:40 -0000	1.249
@@ -1,5 +1,10 @@
 2005-12-04  Albert Astals Cid  <aacid at kde.org>
 
+	* poppler/JPXStream.cc: Fix error in merging CAN-2005-3193 fix. Thanks  
+	Daniel Gryniewicz for notifying
+
+2005-12-04  Albert Astals Cid  <aacid at kde.org>
+
 	* qt/poppler-qt.h:
 	* qt/poppler-fontinfo.h:
 	* qt4/src/poppler-qt4.h: