X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=CHANGELOG;h=e34f2d90e525d63cf4c87298762a9d9f26331d02;hp=7c299dd3941858bab8153361d852642819ec4a1c;hb=c6860bd2b0d52f5f53dd01f0f1857f5d310108ba;hpb=1318fabb307dce513479df1890cac2f20cddda45

diff --git a/CHANGELOG b/CHANGELOG
index 7c299dd..e34f2d9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,33 +1,32 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
-<<<<<<< 1.45
-<<<<<<< 1.43
-=======
-=======
->>>>>>> /tmp/T4a02877
---- XXXXXXXXXXXXX
-
-<<<<<<< CHANGELOG
+Proximity operator added to Prefix Query Format (PQF).
+
+In test client command "base" accepts multiple databases.
+
+Fixed bug in cs_close stack that caused trouble with WINSOCK.
+
+--- 1.3 1996/10/11
+
 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.
-=======
+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.
->>>>>>> /tmp/T4a18297
 
-||||||| 1.45
->>>>>>> /tmp/T4a00109
-=======
 Added SOIF syntax (using private OID for now) to retrieval module and client.
 
->>>>>>> /tmp/T4a02877
+Added Update extended service.
+
+Added SearchResult-1 additional info structure.
+
+Added optional CCL (ISO8777) interpreter as separate module. Available
+in linemode client.
+
 --- 1.2 1996/6/10 (1st anniversary release)
 
 Added Summary record syntax. Lightly tested.