branch is closed

[adns.git] / changelog

diff --git a/changelog b/changelog
index 08cdc9f0c0118a0bbedf062c3bdb5ad237e308e5..1d9416086e9483fbddfbf90d5ad858d660da0a08 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,24 @@
+
+
+THIS BRANCH IS NOW CLOSED
+
+  EVERYTHING HAS BEEN MERGED TO THE TRUNK
+   (at CVS tag mergepoint-logcallbackfn)
+
+  DO NOT EDIT
+  
+
+  * New adns_init_logfn etc. for having logging done with a callback
+    function.
+
+ --
+
 adns (1.2); urgency=medium
 
   * Fix error in prototype in definition of adns__parse_domain.
+  * New LICENCE.WAIVERS file for GPL-incompatility workarounds.
+  * Clarified GPL-vs-LGPL: a bit less hostile and a bit more mercenary.
+  * Allow `;'-comments in resolv.conf (report from Colin Charles).    
 
  --