X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=CHANGELOG;h=2362383c3b25c1e4606d1a74639f3b4a9af34eaa;hp=9a927b1d45811af22319c35494bcd2af509981a2;hb=cbadcb46e4898cb46ad9b49dba8cc4fc789a164a;hpb=ac00a317f993121e851a20209a233ab49fb232ef

diff --git a/CHANGELOG b/CHANGELOG
index 9a927b1..2362383 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,42 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+<<<<<<< 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.
+
+Added OPAC record syntax. Untested.
+
+Added ResourceReport service encoders/decoders. Untested.
+
+Fixed bug in z_Unit - wrong tagging on unitSystem.
+
+Fixed bug in the DiagRecs decoder.
+
+Added options for max PDU size and session timeout to frontend-server.
+
+Added documentation of query-language parsers and other supporting utilities.
+
+[frontend-server] Added Attribute set to the bend_scanrequest API.
+
+[frontend-server] NextResultSetPosition was sometimes set incorrectly when
+surrogate diagnostics were generated.
+
+[retrieval] Allow multiple local values for attribute.
+
+[retrieval] Allow multiple attributes per element in .abs files. index type.
+
+[retrieval] Added Summary tagset, abstract syntax, and d1-node/ASN filter.
+
 --- 1.1pl2  1996/4/10
 
-Minor changes, mostly specific to Zebra
+Minor changes, mostly specific to Zebra's requirements (retrieval)
 
 --- 1.1  1996/2/20