diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-06 13:08:57 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-06 13:08:57 -0700 |
| commit | dd91779442125ca46a434cd94cc51ae32e43bee1 (patch) | |
| tree | e023ebb7a8a0e6f9c6c4a394158773ced0c98a82 /fish.xcodeproj | |
| parent | e58b73179f4727c79465c6f273aef377b9bb8bee (diff) | |
| parent | fab7299d49492ce548d4ceed66d3acbd05dd99c7 (diff) | |
Merge branch 'master' into ast_no_templates
Conflicts:
configure.ac
exec.cpp
Diffstat (limited to 'fish.xcodeproj')
| -rw-r--r-- | fish.xcodeproj/project.pbxproj | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index c397f321..3b85e4bc 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -1345,6 +1345,7 @@ "DATADIR=L\\\"/usr/local/share\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", + "FISH_BUILD_VERSION=\\\"2.0.0\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1564,6 +1565,7 @@ "DATADIR=L\\\"/usr/local/share\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", + "FISH_BUILD_VERSION=\\\"2.0.0\\\"", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1591,6 +1593,7 @@ "DATADIR=L\\\"/usr/local/share\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", + "FISH_BUILD_VERSION=\\\"2.0.0\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; |