aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-08-30 21:23:26 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-08-30 21:24:16 +0100
commita1986c59739c4577545bec6b30d620d29d5747aa (patch)
tree69f8f8e6e0facb65c3da44dd62a68ff34475ad95
parent07d3c4d882b378b65f8ab5e99f8fffbeb797b2ab (diff)
downloadrtmux-a1986c59739c4577545bec6b30d620d29d5747aa.tar.gz
rtmux-a1986c59739c4577545bec6b30d620d29d5747aa.tar.bz2
rtmux-a1986c59739c4577545bec6b30d620d29d5747aa.zip
Add to CHANGES.
-rw-r--r--CHANGES4
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 1 deletions
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)