From 444e9f3c582b2d20800b0fe4aa363fb7e801cbc2 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 11 Mar 2020 06:38:43 +0000
Subject: Bump 3.1-rc up to master.

---
 CHANGES      | 4 +---
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index f40dba56..728bac60 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-CHANGES FROM 3.1 TO 3.2
+CHANGES FROM 3.0a TO 3.1
 
 * Add selection_active format for when the selection is present but not moving
   with the cursor.
@@ -13,8 +13,6 @@ CHANGES FROM 3.1 TO 3.2
 
 * Fix top and bottom pane calculation with pane border status enabled.
 
-CHANGES FROM 3.0a 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
   list-keys shows key bindings with notes. Change the default ? binding to use
diff --git a/configure.ac b/configure.ac
index 380eea73..d98b72f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT([tmux], next-3.2)
+AC_INIT([tmux], 3.1-rc2)
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)
-- 
cgit v1.2.3