mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-21 04:58:14 +00:00
Conflicts: .gitmodules linphone.xcodeproj/project.pbxproj submodules/build/builder-iphone-os.mk submodules/build/builders.d/libvpx.mk submodules/build/builders.d/mssilk.mk submodules/build/builders.d/opencore-amr.mk submodules/build/iphone-config.site submodules/liblinphone.xcodeproj/project.pbxproj submodules/linphone |
||
|---|---|---|
| .. | ||
| builders.d | ||
| builder-iphone-os.mk | ||
| builder-iphone-simulator.mk | ||
| iphone-config-gcc.site | ||
| iphone-config.site | ||
| iphone-toolchain.cmake | ||
| Makefile | ||
| Makefile.xcode4.4 | ||