mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-22 13:48:09 +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 |
||
|---|---|---|
| .. | ||
| ffmpeg.mk | ||
| ffmpeg.patch | ||
| libvpx.mk | ||
| libvpx.patch | ||
| msamr.mk | ||
| mssilk.mk | ||
| msx264.mk | ||
| opencore-amr.mk | ||
| openssl.mk | ||
| openssl.patch | ||
| srtp.mk | ||
| srtp.patch | ||
| x264.mk | ||
| x264.patch | ||
| zrtp.mk | ||
| zrtpcpp.CMakeLists.txt | ||