From be5ba77e8bf24f26910040a8bddbf284a5905b8e Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 29 Jul 2014 14:54:17 +0200 Subject: [PATCH] Update submodules --- .gitignore | 2 ++ linphone.xcodeproj/project.pbxproj | 4 ++-- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e2f3c65b2..0b5eb907c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ build-* *.locuser .DS_Store liblinphone-sdk +liblinphone-iphone-sdk*.zip +xcuserdata/ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 9bb11281d..17ccb5ea7 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -83,7 +83,7 @@ 2200C2DC174BBB24002E9A70 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 226EF06B15FA256B005865C7 /* MobileCoreServices.framework */; }; 22058C71116E305000B08DDD /* linphone_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* linphone_icon_57.png */; }; 220784DF19509EF3001C3BDF /* libmsopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1560821E18EEF26100765332 /* libmsopenh264.a */; }; - 220784E019509EF3001C3BDF /* libwels.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1560821C18EEF23F00765332 /* libwels.a */; }; + 220784E019509EF3001C3BDF /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 220FAD3210765B400068D98F /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; }; 220FAD3810765B400068D98F /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2F10765B400068D98F /* libspeex.a */; }; 220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD3010765B400068D98F /* libspeexdsp.a */; }; @@ -2479,7 +2479,7 @@ 22D8F174147548E2008C97DB /* libilbc.a in Frameworks */, 22D8F16B147548E2008C97DB /* libgsm.a in Frameworks */, 220784DF19509EF3001C3BDF /* libmsopenh264.a in Frameworks */, - 220784E019509EF3001C3BDF /* libwels.a in Frameworks */, + 220784E019509EF3001C3BDF /* (null) in Frameworks */, D34BD61815C13D0B0070C209 /* liblinphone.a in Frameworks */, D37EE10B16032DC2003608A6 /* libmediastreamer_base.a in Frameworks */, D37EE10C16032DC2003608A6 /* libmediastreamer_voip.a in Frameworks */, diff --git a/submodules/belle-sip b/submodules/belle-sip index c6f72e9c7..2b01dd695 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit c6f72e9c72c8bec20f2d779c1c6ee3a0b17691c4 +Subproject commit 2b01dd6952538bc512f7a1c5c8356d91fd9f2931 diff --git a/submodules/linphone b/submodules/linphone index b8c9c8093..d8cc5b600 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b8c9c8093408d7ef1e9091877e4ff5e16cbd241a +Subproject commit d8cc5b600f3771b101f52c2da0761b78a3b4e947