diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-07-12 22:50:34 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-07-12 22:50:34 +0800 |
| commit | 7954b95f5d4280498679d80cc5057a8b9b6b9822 (patch) | |
| tree | c18e26987278e1482dbd7ffe71109262ff252ee8 /fish.xcodeproj | |
| parent | ebf91d59c7577e1c76b9e9e873e5d7f6f5ee3d3e (diff) | |
| parent | e752ac3035e6438303d79845637a4a2eaea4ff02 (diff) | |
Merge branch 'Integration_2.2.0'
Diffstat (limited to 'fish.xcodeproj')
| -rw-r--r-- | fish.xcodeproj/project.pbxproj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index dd4f7262..94b191ec 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -1325,7 +1325,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"", + "FISH_BUILD_VERSION=\\\"2.2.0-git\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1453,7 +1453,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"", + "FISH_BUILD_VERSION=\\\"2.2.0-git\\\"", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1481,7 +1481,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"", + "FISH_BUILD_VERSION=\\\"2.2.0-git\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; |