From a8b84b7cfa29f06346bd46a6ce1f64041f590f19 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 11 Sep 2017 10:08:28 +0100
Subject: [PATCH 1/3] 2.6-rc3.

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

diff --git a/CHANGES b/CHANGES
index 00518f2f..dc88ae80 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-CHANGES FROM 2.5 TO 2.6-rc2, 10 September 2017
+CHANGES FROM 2.5 TO 2.6-rc3, 11 September 2017
 
 * Add select-pane -T to set pane title.
 
diff --git a/configure.ac b/configure.ac
index 26f98373..dcbe4a18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT(tmux, 2.6-rc2)
+AC_INIT(tmux, 2.6-rc3)
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)

From 71ec616e4d8b8ccb37991913fbb1e7386dd98f6a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 22 Sep 2017 09:04:46 +0000
Subject: [PATCH 2/3] Initialize alerts timer event where it is used, avoids
 crash with new windows.

---
 alerts.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/alerts.c b/alerts.c
index 32469c63..d90d0eb8 100644
--- a/alerts.c
+++ b/alerts.c
@@ -141,6 +141,9 @@ alerts_reset(struct window *w)
 {
 	struct timeval	tv;
 
+	if (!event_initialized(&w->alerts_timer))
+		evtimer_set(&w->alerts_timer, alerts_timer, w);
+
 	w->flags &= ~WINDOW_SILENCE;
 	event_del(&w->alerts_timer);
 
@@ -157,9 +160,6 @@ alerts_queue(struct window *w, int flags)
 {
 	alerts_reset(w);
 
-	if (!event_initialized(&w->alerts_timer))
-		evtimer_set(&w->alerts_timer, alerts_timer, w);
-
 	if ((w->flags & flags) != flags) {
 		w->flags |= flags;
 		log_debug("@%u alerts flags added %#x", w->id, flags);

From bd71cbbe276432ce8869baa0f2d55433e1ab820c Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 5 Oct 2017 14:31:23 +0100
Subject: [PATCH 3/3] 2.6.

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

diff --git a/CHANGES b/CHANGES
index dc88ae80..b71dc3e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-CHANGES FROM 2.5 TO 2.6-rc3, 11 September 2017
+CHANGES FROM 2.5 TO 2.6, 05 October 2017
 
 * Add select-pane -T to set pane title.
 
@@ -411,7 +411,7 @@ Normal Changes
 * Copy mode is exited if the history is cleared whilst in copy-mode.
 * 'copy-mode' learned '-e' to exit copy-mode when scrolling to end.
 
-CHANGES FROM 1.9a TO 2.0, 6 March 2015
+CHANGES FROM 1.9a TO 2.0, 06 March 2015
 
 Incompatible Changes
 ====================
diff --git a/configure.ac b/configure.ac
index dcbe4a18..ca89e2da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT(tmux, 2.6-rc3)
+AC_INIT(tmux, 2.6)
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)