more 3.00 -> 3.01 merging

e0cbb0ca · Albert Astals Cid · 9c7adb31 · e0cbb0ca · e0cbb0ca
Commit e0cbb0ca authored Sep 20, 2005 by Albert Astals Cid
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ChangeLog ChangeLog +1 -0

poppler/XRef.cc poppler/XRef.cc +0 -1

No files found.
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	* poppler/Link.cc: Merge from xpdf 3.01
 	* poppler/UnicodeMap.cc: More grealloc -> greallocn
 	* poppler/UnicodeTypeTable.cc: Merge from xpdf 3.01
+	* poppler/XRef.cc: Merge from xpdf 3.01

 2005-09-20  Marco Pesenti Gritti  <mpg@redhat.com>


--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -22,7 +22,6 @@
 #include "Lexer.h"
 #include "Parser.h"
 #include "Dict.h"
-#include "Decrypt.h"
 #include "Error.h"
 #include "ErrorCodes.h"
 #include "XRef.h"