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

diff --git a/CHANGELOG b/CHANGELOG
index ecc720f..7c299dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,13 +1,33 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+<<<<<<< 1.45
+<<<<<<< 1.43
+=======
+=======
+>>>>>>> /tmp/T4a02877
 --- XXXXXXXXXXXXX
 
+<<<<<<< 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.