From e0cbb0ca2c611ad5ac0267e46279c9d61450902a Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Tue, 20 Sep 2005 14:59:43 +0000
Subject: [PATCH] more 3.00 -> 3.01 merging

---
 ChangeLog       | 1 +
 poppler/XRef.cc | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e18c095d9..6b3859c4d 100644
--- 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>
 
diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index 959f3295b..c61e41e6d 100644
--- 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"
-- 
GitLab