h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-04-23 02:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Integration_2.2.0'

Browse Source
This commit is contained in:
David Adam
2015-07-12 22:50:34 +08:00
parent ebf91d59c7 e752ac3035
commit 7954b95f5d
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fish.xcodeproj/project.pbxproj
View File

@@ -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;