aboutsummaryrefslogtreecommitdiffhomepage
path: root/osx
diff options
context:
space:
mode:
authorGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2016-05-06 23:11:52 +0100
committerGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2016-05-06 23:11:52 +0100
commit28228627fc4f8954410a22b00546b2b367ae846e (patch)
treeabdd4116dae22919ffd294685a75d3665c34b953 /osx
parent1c6f6df2b3ae4a13d89242964ca3dbd3c146d1fe (diff)
parent8ec81393a36dea2a76dd85a3858a2835b5c32ff6 (diff)
Merge branch 'Integration_2.3.0'
(Bump version numbers to reflect post-2.3b2)
Diffstat (limited to 'osx')
-rw-r--r--osx/Info.plist4
-rw-r--r--osx/config.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/osx/Info.plist b/osx/Info.plist
index 68fdbe1f..3a2742dd 100644
--- a/osx/Info.plist
+++ b/osx/Info.plist
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.0</string>
+ <string>2.2.999</string>
<key>CFBundleVersion</key>
- <string>289.5</string>
+ <string>0.1</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>
diff --git a/osx/config.h b/osx/config.h
index fd61d273..23e376a8 100644
--- a/osx/config.h
+++ b/osx/config.h
@@ -219,7 +219,7 @@
#define PACKAGE_NAME "fish"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fish 2.2.0-git"
+#define PACKAGE_STRING "fish 2.3b2-git"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "fish"
@@ -228,7 +228,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.2.0-git"
+#define PACKAGE_VERSION "2.3b2-git"
/* The size of `wchar_t', as computed by sizeof. */
#define SIZEOF_WCHAR_T 4