summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2019-07-29 10:53:04 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2019-07-29 10:53:04 +0100
commitb8b865fb17caba880b1c178f8c0bdb855cfe98c8 (patch)
treedd34ba76cb92ac65ce286c1f68ad9ab76eeda485
parentda552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf (diff)
Bump 3.0-rc up to master.
-rw-r--r--CHANGES4
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 952a95a6..ad50d54c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-CHANGES FROM 3.0 to X.X
+CHANGES FROM 2.9 to 3.0
* Expand arguments to C and s format modifiers to match the m modifier.
@@ -51,8 +51,6 @@ CHANGES FROM 3.0 to X.X
* Support for octal escapes in strings (such as \007) and improve list-keys
output so it parses correctly if copied into a configuration file.
-CHANGES FROM 2.9 to 3.0
-
* INCOMPATIBLE: Add a new {} syntax to the configuration file. This is a string
similar to single quotes but also includes newlines and allows commands that
take other commands as string arguments to be expressed more clearly and
diff --git a/configure.ac b/configure.ac
index 5fba1eaf..21e8926d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# configure.ac
-AC_INIT([tmux], next-3.1)
+AC_INIT([tmux], 3.0-rc4)
AC_PREREQ([2.60])
AC_CONFIG_AUX_DIR(etc)