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

Merge branch 'master' into ast

Browse Source 
Conflicts:
	parse_util.cpp
This commit is contained in:
ridiculousfish
2013-10-16 01:48:21 -07:00
parent b06e798373 3b25795ee5
commit 630b0515ad
9 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fish.xcodeproj/project.pbxproj
View File

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