Default prefix query attribute set defined by using p_query_attset.

[yaz-moved-to-github.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 98212d2..2362383 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,13 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
---- 1.2 1996/6/x (1st anniversary release)
+<<<<<<< 1.43
+=======
+--- XXXXXXXXXXXXX
+
+Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
+
+>>>>>>> /tmp/T4a00109
+--- 1.2 1996/6/10 (1st anniversary release)
 
 Added Summary record syntax. Lightly tested.