X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=CHANGELOG;h=7c299dd3941858bab8153361d852642819ec4a1c;hp=c5a80b78f56baad2f0538d78a7a3178c8cba38df;hb=de697b2c40e31fd28235af628940bd08734f764b;hpb=658b0fee0e1a3cb2eda9933a5287e9c2d731ba36

diff --git a/CHANGELOG b/CHANGELOG
index c5a80b7..7c299dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,16 +1,63 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
----
+<<<<<<< 1.45
+<<<<<<< 1.43
+=======
+=======
+>>>>>>> /tmp/T4a02877
+--- XXXXXXXXXXXXX
 
-Added Attribute set to the bend_scanrequest API.
+<<<<<<< CHANGELOG
+Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
+
+<<<<<<< CHANGELOG
+Smallish bug-fixes in the new encoders/decoders (explain).
+
+Bug (stupid) fixed in DeleteRequest.
+||||||| 1.46
+Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
+=======
+Fixed tagging bug of type 101 query in SearchRequest-Query PDU encoder/decoder.
+
+Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
+>>>>>>> /tmp/T4a18297
+
+||||||| 1.45
+>>>>>>> /tmp/T4a00109
+=======
+Added SOIF syntax (using private OID for now) to retrieval module and client.
+
+>>>>>>> /tmp/T4a02877
+--- 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] 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