h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-23 21:31: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-05-21 15:30:26 +08:00
parent 2008415106 1c99ef5b6e
commit 781b61d074
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fish.xcodeproj/project.pbxproj
View File

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