From 67cd496b39e0c9caf51fe79dc24af74517f8bd1b Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Sun, 4 Jun 2017 09:09:28 +0100
Subject: [PATCH] Update CHANGES.

---
 CHANGES | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index 314a0f9f..8bc488f5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 CHANGES FROM 2.5 to master
 
+* Make set-clipboard a three state option: on (tmux both sends to outside
+  terminal and accepts from applications inside); external (tmux sends outside
+  but does not accept inside); and off.
+
+* Fix OSC 4 palette setting for bright foreground colours. GitHub issue 954.
+
 * Use setrgbf and setrgbb terminfo(5) capabilities to set RGB colours, if they
   are available. (Tc is still supported as well.)