aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2019-11-27 20:55:19 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2019-11-27 20:55:19 +0000
commit7a30e6b9414eb74d784b1d025573862df973883b (patch)
tree4e651b49c51977de452d8c29fd99d162b68ccf4b
parentc942f11ba89cfb8dc74908609669fd78f1276ba7 (diff)
parent0134574a67051b862ea25123bb24d6b557dbdad9 (diff)
downloadrtmux-7a30e6b9414eb74d784b1d025573862df973883b.tar.gz
rtmux-7a30e6b9414eb74d784b1d025573862df973883b.tar.bz2
rtmux-7a30e6b9414eb74d784b1d025573862df973883b.zip
Merge branch '3.0-rc' into 3.0a-rc
-rw-r--r--CHANGES3
-rw-r--r--configure.ac2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index f4ff86d2..e38b859b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
CHANGES FROM 2.9 to 3.0
+* Workaround invalid layout strings generated by older tmux versions and add
+ some additional sanity checks
+
* xterm 348 now disables margins when resized, so send DECLRMM again after
resize.
diff --git a/configure.ac b/configure.ac
index 8b7f171e..57c3fd73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# configure.ac
-AC_INIT([tmux], 3.0)
+AC_INIT([tmux], 3.0a)
AC_PREREQ([2.60])
AC_CONFIG_AUX_DIR(etc)