diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-16 01:48:21 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-16 01:48:21 -0700 |
| commit | 630b0515ad494225c8c8532670ffd3d1e2359140 (patch) | |
| tree | 6e13c910165de92d30f08a83c23e285c31e90898 /fish.xcodeproj | |
| parent | b06e7983733578d783bc585e7b0fc95f401b2e8d (diff) | |
| parent | 3b25795ee5760b29cd0498f15dfb0d30f8638138 (diff) | |
Merge branch 'master' into ast
Conflicts:
parse_util.cpp
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 04d0c7cb..4bbf5677 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -1337,7 +1337,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; @@ -1557,7 +1557,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; @@ -1585,7 +1585,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; |