forked from mirrors/linphone-iphone
Conflicts: Classes/ContactDetailsTableViewController.m Classes/ContactsViewController.m Classes/InCallTableViewController.m Classes/LinphoneCoreSettingsStore.m Classes/LinphoneManager.m Classes/LinphoneUI/UICallBar.m Classes/LinphoneUI/UICompositeViewController.m Classes/PhoneMainView.m Classes/WizardViewController.m Settings.bundle/Root.plist linphone.xcodeproj/project.pbxproj linphonerc-factory linphonerc-factory~ipad |
||
|---|---|---|
| .. | ||
| en.lproj | ||
| Advanced.plist | ||
| audio.plist | ||
| Root.plist | ||
| video.plist | ||