mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-17 11:08:06 +00:00
Conflicts: .gitmodules Classes/LinphoneAppDelegate.m Settings.bundle/Root.plist linphone.xcodeproj/project.pbxproj submodules/build/builder-iphone-os.mk submodules/liblinphone.xcodeproj/project.pbxproj submodules/linphone |
||
|---|---|---|
| .. | ||
| build | ||
| externals | ||
| libilbc-rfc3951@af32518af4 | ||
| liblinphone.xcodeproj | ||
| linphone@ce510f9d1f | ||
| msamr@17391e3246 | ||
| msilbc@3d49d56a59 | ||
| mssilk@a0ad1cca90 | ||
| msx264@6ba1b86990 | ||
| liblinphone_Prefix.pch | ||