branch is closed

[adns.git] / changelog

diff --git a/changelog b/changelog
index e88f5fcd4ce914f0bda607c9b20b5521706f471a..1d9416086e9483fbddfbf90d5ad858d660da0a08 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,27 @@
+
+
+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).    
+
+ --
+
 adns (1.1); urgency=medium
 
   Major bugfixes:
@@ -20,7 +44,7 @@ adns (1.1); urgency=medium
   * README.html: mentioned Jarle Aase's Windows port, and other fixes.
   * Some better source code formatting/wrapping.
 
- --
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Tue,  1 Jul 2003 22:55:29 +0100
 
 adns (1.0); urgency=medium