mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-18 11:38:08 +00:00
Conflicts: Classes/LinphoneUI/LinphoneManager.h Classes/LinphoneUI/LinphoneManager.m Settings.bundle/Root.plist Settings/InAppSettings.bundle/Root.plist linphone.xcodeproj/project.pbxproj submodules/build/builders.d/x264.mk |
||
|---|---|---|
| .. | ||
| builders.d | ||
| builder-iphone-os.mk | ||
| builder-iphone-simulator.mk | ||
| iphone-config.site | ||
| iphone-toolchain.cmake | ||
| Makefile | ||
| Makefile.xcode4.4 | ||