X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=changelog;h=fb82e7610643334514d87da50e4248c1a977d1dc;hb=2d23048790f0db14cfd5e2c60a40ef88f547d066;hp=e88f5fcd4ce914f0bda607c9b20b5521706f471a;hpb=c5f033dba6fbc5848658e96aa71980c688020796;p=adns.git

diff --git a/changelog b/changelog
index e88f5fc..fb82e76 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+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 +29,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