aboutsummaryrefslogtreecommitdiffhomepage
path: root/osx
diff options
context:
space:
mode:
authorGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2015-03-11 13:49:06 +0800
committerGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2015-03-11 13:49:06 +0800
commit1116929d2f20f299a28c1211f48805dc4f495975 (patch)
tree1e89f3160fac984df4dbbeb07a18b2779d2a5f0a /osx
parent22103e4849f68106fb9748d56c313220eec36812 (diff)
parent95687a03fb2ec61818e84e7c0c32303d7ee043d0 (diff)
Merge branch 'Integration_2.1.2'
Diffstat (limited to 'osx')
-rw-r--r--osx/config.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/osx/config.h b/osx/config.h
index e2e4bf57..36181d7d 100644
--- a/osx/config.h
+++ b/osx/config.h
@@ -222,7 +222,7 @@
#define PACKAGE_NAME "fish"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fish 2.1.1-git"
+#define PACKAGE_STRING "fish 2.1.2-git"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "fish"
@@ -231,7 +231,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.1.1-git"
+#define PACKAGE_VERSION "2.1.2-git"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1