Merge branch 'new_branch_name'

This commit is contained in:
Alarantalara 2013-06-24 23:45:32 -04:00
commit fd58461ef9
3 changed files with 800 additions and 730 deletions

File diff suppressed because it is too large Load diff

View file

@ -4920,15 +4920,15 @@
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(NATIVE_ARCH)";
ENABLE_OPENMP_SUPPORT = NO;
ARCHS = (
i386,
ppc,
);
FRAMEWORK_SEARCH_PATHS = ./lib;
GCC_DYNAMIC_NO_PIC = YES;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_INPUT_FILETYPE = automatic;
GCC_PREPROCESSOR_DEFINITIONS = "LOCALEDIR=\\\"translations\\\"";
GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_VERSION = 4.0;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
../..,
@ -4948,8 +4948,7 @@
"-lz",
"-lbz2",
);
PREBINDING = NO;
SDKROOT = "";
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
};
name = Release;
};