Merge branch 'new_ui' into apple_store

This commit is contained in:
Jehan Monnier 2012-10-22 09:49:41 +02:00
commit d50c695489
2 changed files with 15 additions and 23 deletions

View file

@ -42,7 +42,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.5.2</string>
<string>3.5.3</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@ -71,10 +71,10 @@
<string>voip</string>
<string>audio</string>
</array>
<key>UILaunchImageFile~iphone</key>
<string>linphone_splashscreen</string>
<key>UILaunchImageFile~ipad</key>
<string>linphone_splashscreen</string>
<key>UILaunchImageFile~iphone</key>
<string>linphone_splashscreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>wifi</string>

View file

@ -5250,23 +5250,21 @@
);
PRODUCT_NAME = linphone;
SKIP_INSTALL = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
228B19A61302902F00F154D3 /* DistributionAdhoc */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
"$(ARCHS_STANDARD_32_BIT)",
armv6,
);
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = "";
PROVISIONING_PROFILE = "EE9CAF78-3536-4133-BAAA-020FDF65D279";
SDKROOT = iphoneos;
@ -5324,6 +5322,7 @@
);
PRODUCT_NAME = linphone;
SKIP_INSTALL = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = DistributionAdhoc;
};
@ -5525,17 +5524,14 @@
22F3D55513CC3C9100A0DA02 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
"$(ARCHS_STANDARD_32_BIT)",
armv6,
);
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = "";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
@ -5592,23 +5588,21 @@
);
PRODUCT_NAME = linphone;
SKIP_INSTALL = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
22F51EE7107FA53D00F98953 /* Distribution */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
"$(ARCHS_STANDARD_32_BIT)",
armv6,
);
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = "";
PROVISIONING_PROFILE = "075921BC-C7D8-42E1-B864-F05FD9BF841C";
SDKROOT = iphoneos;
@ -5666,23 +5660,21 @@
);
PRODUCT_NAME = linphone;
SKIP_INSTALL = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Distribution;
};
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
"$(ARCHS_STANDARD_32_BIT)",
armv6,
);
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)";
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = "";
PROVISIONING_PROFILE = "79E53132-649F-48B3-A931-24792E466A11";
SDKROOT = iphoneos;