+ * New adns_init_logfn etc. for having logging done with a callback

@@ -1,4 +1,4 @@
-adns (1.2); urgency=medium
+adns (1.1.999.0.1); urgency=medium

   * Fix error in prototype in definition of adns__parse_domain.
   * New LICENCE.WAIVERS file for GPL-incompatility workarounds.
@@ -16,6 +16,8 @@
   * Add bind(2) and listen(2) to test harness (for epithet's benefit, but
     harmless in adns).
   * Add missing ENOTSOCK to hcommon.c.m4 (was already in hcommon.c!)
+  * New adns_init_logfn etc. for having logging done with a callback
+    function.

  --

diff --cc changelog
index 058436de13707701688f6a9d71d61489c3a0bd81,1d9416086e9483fbddfbf90d5ad858d660da0a08..a4bdd9725ecde97b689ac4e345bde744dc261040
--- 1/changelog
--- 2/changelog
+++ b/changelog
@@@ -1,21 -1,24 +1,23 @@@
 -
 -
 -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
++adns (1.1.999.0.1); 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).    
 +  * Added a TODO list item.
 +  * Add .PHONY: install to Makefile, to help people with demented fs's.
 +  * Darwin listed in INSTALL.
 +  * New adnsheloex client courtesy of Tony Finch (and copyright notices
 +    updated).
 +  * Add documentation comment by definition of adns_r_ptr_raw type enum.
 +  * Add -Wno-pointer-sign if GCC has that option.
 +  * Call Tensurerecordfile in Hgettimeofday (Tensurerecordfile was
 +    Tensureinputfile/Tensureoutputfile).
 +  * Add bind(2) and listen(2) to test harness (for epithet's benefit, but
 +    harmless in adns).
 +  * Add missing ENOTSOCK to hcommon.c.m4 (was already in hcommon.c!)
++  * New adns_init_logfn etc. for having logging done with a callback
++    function.
  
   --
  

diff --cc src/adns.h
Simple merge