forked from mirrors/linphone-iphone
Conflicts: .gitmodules Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj submodules/build/Makefile submodules/build/builder-iphone-os.mk |
||
|---|---|---|
| .. | ||
| project.pbxproj | ||
Conflicts: .gitmodules Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj submodules/build/Makefile submodules/build/builder-iphone-os.mk |
||
|---|---|---|
| .. | ||
| project.pbxproj | ||