Merge remote-tracking branch 'public/master' into 3.0.x

This commit is contained in:
Gautier Pelloux-Prayer 2015-10-19 15:01:42 +02:00
commit b3eabdf2fe
14 changed files with 11 additions and 7 deletions

View file

@ -24,3 +24,4 @@
"Release core" = "Release core";
"Clear cache" = "Clear cache";
"Battery alert" = "Battery alert";
"Auto answer call immediately" = "Auto answer call immediately";

View file

@ -53,9 +53,10 @@
}
- (void)testDialInvalidSIPURI {
[self callURI:@"123 😀"];
[tester waitForViewWithAccessibilityLabel:
@"Some invalid characters where found in the given SIP address. Please correct it."];
NSString *user = @"123 😀";
[self callURI:user];
[tester waitForViewWithAccessibilityLabel:[NSString
stringWithFormat:@"Cannot call %@.\nReason was: Call failed", user]];
[tester tapViewWithAccessibilityLabel:@"Cancel" traits:UIAccessibilityTraitButton];
}

View file

@ -388,7 +388,9 @@ sdk:
\t\t{multiarch} \\
\t\techo "[{archs}] Mixing `basename $$archive` in $$destpath"; \\
\t\tlipo -create $$all_paths -output $$destpath; \\
\tdone
\tdone; \\
\techo 'NOTE: the following libraries were STUBBED:'; \\
\tcat WORK/ios-{first_arch}/Build/dummy_libraries/dummy_libraries.txt
build: $(addsuffix -build, $(archs))
\t$(MAKE) sdk

@ -1 +1 @@
Subproject commit 1ced637855bb052f2475847c867f648338b84376
Subproject commit 611b6c3b1d237dc9fa4113c39c2f5f070235b783

@ -1 +1 @@
Subproject commit e5ddd892561b0c5df25b7036bd9229fe6a6ea81a
Subproject commit 39bc0ebcebe3485b5cfcacbbe22092eeb97997a0

@ -1 +1 @@
Subproject commit 725b8665663f753b28d3c6892949a8c4157abf66
Subproject commit dae216855ca67430cc25135f4eef52f1e5edc1c2