From e300b2e30d0a275cd88ea4d0d2f462d40c3ef88f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 26 May 2015 12:10:36 +0200
Subject: [PATCH] Update changelog.

---
 CHANGELOG.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0af6c0d0f..2981578e6 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,7 @@ Added
 - New arguments `--basedir` and `--temp-basedir` (intended for debugging) to set a different base directory for all data, which allows multiple invocations.
 - New argument `--no-err-windows` to suppress all error windows.
 - New visual/caret mode (bound to `v`) to select text by keyboard.
+- New setting `tabs -> mousewheel-tab-switching` to control mousewheel behavior on the tab bar.
 
 Changed
 ~~~~~~~