diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-16 01:15:14 -0700 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-16 01:15:14 -0700 |
commit | 3b25795ee5760b29cd0498f15dfb0d30f8638138 (patch) | |
tree | 4b06e9cdac42f539332e15761cbb2b7d89b4a9d8 /fish.xcodeproj | |
parent | ef18d6f70cf33c44c5dbf03f96fa4ed194957cae (diff) | |
parent | 3c5d5b344ee945b99e4bb16a44af6f293601813d (diff) |
Merge branch 'Integration_2.1.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 d1b78d8d..9f1ad217 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -1190,7 +1190,7 @@ "DATADIR=L\\\"/usr/local/share\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", - "FISH_BUILD_VERSION=\\\"2.0.0\\\"", + "FISH_BUILD_VERSION=\\\"2.1.0\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1342,7 +1342,7 @@ "DATADIR=L\\\"/usr/local/share\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", - "FISH_BUILD_VERSION=\\\"2.0.0\\\"", + "FISH_BUILD_VERSION=\\\"2.1.0\\\"", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1370,7 +1370,7 @@ "DATADIR=L\\\"/usr/local/share\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", - "FISH_BUILD_VERSION=\\\"2.0.0\\\"", + "FISH_BUILD_VERSION=\\\"2.1.0\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; |