From d7ffdfa994e3648a1e03fd1c1796c6e24bf00693 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Tue, 2 Mar 2021 06:28:55 -0500
Subject: Add optional conflict detection to mergeResources

Also improve behavior around direct vs. indirect resources.
---
 ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index d9b09752..1addba33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2021-03-03  Jay Berkenbilt  <ejb@ql.org>
+
+	* Add QPDFObjectHandle::makeResourcesIndirect
+
+2021-03-02  Jay Berkenbilt  <ejb@ql.org>
+
+	* Add an optional resource_names argument to getUniqueResourceName
+	for added efficiency.
+
+	* Add conflict detection QPDFObjectHandle::mergeResources.
+
 2021-03-01  Jay Berkenbilt  <ejb@ql.org>
 
 	* Improve code that finds unreferenced resources to ignore names
-- 
cgit v1.2.3-54-g00ecf