From: gthess <george@nlnetlabs.nl>
Date: Wed, 14 Aug 2019 09:45:41 +0000 (+0200)
Subject: Merge branch 'master' into show-build-options
X-Git-Tag: release-1.9.3rc1~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F57%2Fhead;p=thirdparty%2Funbound.git

Merge branch 'master' into show-build-options
---

fd415d883376d8360792bd693944301072793dbd
diff --cc doc/Changelog
index acd030487,a907cd2a1..3b6ed46f7
--- a/doc/Changelog
+++ b/doc/Changelog
@@@ -1,9 -1,6 +1,12 @@@
+ 14 August 2019: Wouter
+ 	- Generate configlexer with newer flex.
+ 
 +12 August 2019: George
 +	- Introduce `-V` option to print the version number and build options.
 +	  Previously reported build options like linked libs and linked modules
 +	  are now moved from `-h` to `-V` as well for consistency.
 +	- PACKAGE_BUGREPORT now also includes link to GitHub issues.
 +
  1 August 2019: Wouter
  	- For #52 #53, second context does not close logfile override.
  	- Fix #52 #53, fix for example fail program.