Merge with main repo.

1 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ad627be0..90dd3170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,9 +45,15 @@ dillo-3.1 [not released yet]
  - In location bar, tend toward showing beginning of URL instead of end.
  - Handle irix's version of vsnprintf().
  - INPUT, TEXTAREA placeholder attribute.
+ - Better notification when user's domainrc settings block page redirection.
+ - Fix bug with font_factor preference and CSS font-size:(larger|smaller).
+ - Recognize Menu key in keysrc.
    Patches: corvid
 +- Avoid requesting background images if an ancestor has display:none.
-   Patch: Johannes Hofmann
+ - Ignore built-in search url if any are specified in dillorc.
+   Patches: Johannes Hofmann
++- Doxygen fixes.
+   Patch: Jeremy Henty
 
 -----------------------------------------------------------------------------