aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index eb86c8af..6cf34d9f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-CHANGES FROM 2.5 TO master
+CHANGES FROM 2.5 TO 2.6-rc, 29 August 2017
* 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 83c104c3..de52137b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# configure.ac
-AC_INIT(tmux, master)
+AC_INIT(tmux, 2.6-rc)
AC_PREREQ([2.60])
AC_CONFIG_AUX_DIR(etc)