From cec450c50e5f40f6ea3b72f3b65423f527f1ca80 Mon Sep 17 00:00:00 2001
From: Daniel Carl <danielcarl@gmx.de>
Date: Tue, 11 Apr 2017 21:46:44 +0200
Subject: [PATCH] Merge into changelog entries of 2.12 release.

---
 CHANGELOG.md | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6862109..4347998 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,33 @@
 
 ### Removed
 
-* `FEATURE_COOKIE` precompiler flag was removed bcause compiling without cookie
+* `FEATURE_COOKIE` precompiler flag was removed because compiling without cookie
   support does not bring any real benefit
 
+## [2.12] - 2017-04-11
+
+### Added
+
+* Queueing of key events - fixes swalled chars in case of some imap bindings
+  #258 (thanks to Michael Mackus)
+* Allow to disable xembed by `FEATURE_NO_XEMBED` to compile on wayland only
+  platforms (thanks to Patrick Steinhardt)
+* Custom default_zoom setting disables HIGH_DPI logic (thanks to Robert Timm)
+* Allow link activation from search result via `<CR>` #131
+
+### Changed
+
+* Allow shortcuts without parameters #329
+* Write soup cache to disk after each page load to allow other instances to
+  pick this up.
+* Use the beginning position of links for hinting (thanks to Yutao Yuan)
+
+### Fixed
+
+* Fix path expansion to accept only valid POSIX.1-2008 usernames (thanks to
+  Manzur Mukhitdinov)
+* Fix default previouspattern (thanks to Nicolas Porcel)
+
 ## [2.11] - 2015-12-17
 
 ### Added
@@ -52,4 +76,5 @@
 * Fixed none POSIX `echo -n` call
 
 [unreleased]: https://github.com/fanglingsu/vimb/compare/2.11...HEAD
+[2.12]: https://github.com/fanglingsu/vimb/compare/2.11...2.12
 [2.11]: https://github.com/fanglingsu/vimb/compare/2.10...2.11
-- 
2.20.1