From b0389cb77daa8f3a4e96b8cf4495aa58cf962e31 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 3 Jun 2017 20:45:13 +0800
Subject: [PATCH] Bump version for 2.6.0

---
 osx/Info.plist | 2 +-
 osx/config.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osx/Info.plist b/osx/Info.plist
index 3405b54d3..3922a34fb 100644
--- a/osx/Info.plist
+++ b/osx/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.900</string>
+	<string>2.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>0.1</string>
 	<key>LSApplicationCategoryType</key>
diff --git a/osx/config.h b/osx/config.h
index 9d045115f..5a5253a8e 100644
--- a/osx/config.h
+++ b/osx/config.h
@@ -200,7 +200,7 @@
 #define PACKAGE_NAME "fish"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fish 2.6b1"
+#define PACKAGE_STRING "fish 2.6.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "fish"
@@ -209,7 +209,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.6b1"
+#define PACKAGE_VERSION "2.6.0"
 
 /* The size of `wchar_t', as computed by sizeof. */
 #define SIZEOF_WCHAR_T 4