From a1986c59739c4577545bec6b30d620d29d5747aa Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 30 Aug 2017 21:23:26 +0100
Subject: [PATCH] Add to CHANGES.

---
 CHANGES      | 4 ++++
 configure.ac | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index cc49e53c..4885293c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 CHANGES FROM 2.5 TO 2.6-rc, 29 August 2017
 
+* Fix memory leak when lines with BCE are removed from history.
+
+* Fix (again) the "prefer unattached" behaviour of attach-session.
+
 * Reorder how keys are checked to allow keys to be specified that have a
   leading escape. GitHub issue 1048.
 
diff --git a/configure.ac b/configure.ac
index de52137b..83c104c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT(tmux, 2.6-rc)
+AC_INIT(tmux, master)
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)