h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-06 22:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ast_templates

Browse Source 
Conflicts:
	fish_tests.cpp
This commit is contained in:
ridiculousfish
2013-07-21 14:04:06 -07:00
parent 93f27666db f9c2a77c67
commit 551d2dfebd
22 changed files with 756 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fish.xcodeproj/project.pbxproj
View File

@@ -1209,6 +1209,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/**";
WARNING_CFLAGS = "-Wall";
};
name = "Release_C++11";
};
@@ -1361,6 +1362,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/**";
WARNING_CFLAGS = "-Wall";
};
name = Debug;
};
@@ -1385,6 +1387,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/**";
WARNING_CFLAGS = "-Wall";
};
name = Release;
};