From 37f83adca8b965133ebdaeebea790ae897bd7175 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 25 Oct 2017 15:19:41 +0100
Subject: Update CHANGES.

---
 CHANGES | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGES b/CHANGES
index 24bc1dfa..8d40d396 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,19 @@
 CHANGES FROM 2.6 TO master
 
+* Support %else in config files to match %if; from Brad Town in GitHub issue
+  1071.
+
+* Fix "kind" terminfo(5) capability to be S-Down not S-Up.
+
+* Add a box around the preview label in tree mode.
+
+* Show exit status and time in the remain-on-exit pane text; from Timo
+  Boettcher in GitHub issue 1103.
+
+* Correctly use pane-base-index in tree mode.
+
+* Change the allow-rename option default to off.
+
 * Support for xterm(1) title stack escape sequences (GitHub issue 1075 from
   Brad Town).
 
-- 
cgit