Add optional conflict detection to mergeResources

Also improve behavior around direct vs. indirect resources.

1 files changed, 11 insertions, 0 deletions

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