diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-03-11 13:49:06 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-03-11 13:49:06 +0800 |
| commit | 1116929d2f20f299a28c1211f48805dc4f495975 (patch) | |
| tree | 1e89f3160fac984df4dbbeb07a18b2779d2a5f0a | |
| parent | 22103e4849f68106fb9748d56c313220eec36812 (diff) | |
| parent | 95687a03fb2ec61818e84e7c0c32303d7ee043d0 (diff) | |
Merge branch 'Integration_2.1.2'
| -rw-r--r-- | fish.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | osx/config.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index 3981dc9d..07220df8 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -1299,7 +1299,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.1.0\\\"", + "FISH_BUILD_VERSION=\\\"2.1.2\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1427,7 +1427,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.1.0\\\"", + "FISH_BUILD_VERSION=\\\"2.1.2\\\"", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1455,7 +1455,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.1.0\\\"", + "FISH_BUILD_VERSION=\\\"2.1.2\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; 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 |