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

Merge branch 'master' into ast

Browse Source
This commit is contained in:
ridiculousfish
2013-11-06 13:14:52 -08:00
parent 964c7e6f3b 6d542b8bb0
commit 5d84e86d89
14 changed files with 1187 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fish.xcodeproj/project.pbxproj
View File

@@ -1337,6 +1337,7 @@
"DATADIR=L\\\"/usr/local/share\\\"",
"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"",
"FISH_BUILD_VERSION=\\\"2.1.0\\\"",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1557,6 +1558,7 @@
"DATADIR=L\\\"/usr/local/share\\\"",
"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"",
"FISH_BUILD_VERSION=\\\"2.1.0\\\"",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -1585,6 +1587,7 @@
"DATADIR=L\\\"/usr/local/share\\\"",
"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"",
"FISH_BUILD_VERSION=\\\"2.1.0\\\"",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;