diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-05-21 15:30:26 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-05-21 15:32:23 +0800 |
| commit | 781b61d07438d122a83ae5ee23635927dae0ad3d (patch) | |
| tree | 003cbd8708193dc148577d5b5ab09a61a355918f /fish.xcodeproj | |
| parent | 2008415106144a3809b3b84a40f551d2ffe39472 (diff) | |
| parent | 1c99ef5b6eead6cec663b8ca5caab2df2000287c (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 91045d09..74b55a76 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -1327,7 +1327,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.1.2\\\"", + "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = 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.2\\\"", + "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1483,7 +1483,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.1.2\\\"", + "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; |