aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2020-02-04 07:44:49 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2020-02-04 07:44:49 +0000
commit4822130b3cddb02025e72e6a35c861b48fe4c4de (patch)
tree0184264e012afca7dfe186442e19a0153c0d360a
parent0bf153daa6ff06b35c902dc1d579ee2775d54a4f (diff)
parent63a69fe08540d9fcfbc5548c5236e5e5d9d48de9 (diff)
downloadrtmux-4822130b3cddb02025e72e6a35c861b48fe4c4de.tar.gz
rtmux-4822130b3cddb02025e72e6a35c861b48fe4c4de.tar.bz2
rtmux-4822130b3cddb02025e72e6a35c861b48fe4c4de.zip
Merge branch '3.1-rc'
-rw-r--r--CHANGES2
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 48f2f8dd..d5082171 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-CHANGES FROM 3.0 to X.X
+CHANGES FROM 3.0 to 3.1
* Add support for adding a note to a key binding (with bind-key -N) and use
this to add descriptions to the default key bindings. A new -N flag to
diff --git a/configure.ac b/configure.ac
index 5fba1eaf..c0098591 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# configure.ac
-AC_INIT([tmux], next-3.1)
+AC_INIT([tmux], 3.1-rc)
AC_PREREQ([2.60])
AC_CONFIG_AUX_DIR(etc)