X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=CHANGELOG;h=63f85edcd18960da044bbdb9f98c5379bdc1721e;hb=f8ec9ce4a0624d49be64a0cce115846155b79e42;hp=2362383c3b25c1e4606d1a74639f3b4a9af34eaa;hpb=f537f1037e07b2a4be1681d158e17cc62683cbfa;p=yaz-moved-to-github.git

diff --git a/CHANGELOG b/CHANGELOG
index 2362383..63f85ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,23 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
-<<<<<<< 1.43
-=======
 --- XXXXXXXXXXXXX
 
 Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
 
->>>>>>> /tmp/T4a00109
+Smallish bug-fixes in the new encoders/decoders (explain).
+
+Bug fixed in DeleteRequest.
+
+Fixed tagging bug of type 101 query in SearchRequest-Query PDU encoder/decoder.
+
+Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
+
+Added SOIF syntax (using private OID for now) to retrieval module and client.
+
+Added Update extended service.
+
+Added SearchResult-1 additional info structure.
+
 --- 1.2 1996/6/10 (1st anniversary release)
 
 Added Summary record syntax. Lightly tested.