From ec1f00e59b62a404b564aedff1640f8dc2704664 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 16 May 2017 13:07:55 +0800
Subject: [PATCH] CHANGELOG: updates for 2.6.0

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e84c94644..225b90407 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# fish 2.6.0 (released ???)
+
+2.6.0 contains the following fixes since 2.6b1:
+
+- fish successfully builds on OS X 10.10 (#4029).
+- Improved completions for gphoto (#4031). 
+
+If you are upgrading from version 2.5.0 or before, please also review the release notes for 2.6b1 (included below).
+
+---
+
 # fish 2.6b1 (released May 14, 2017)
 
 ## Notable fixes and improvements