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 |
||
|---|---|---|
| .. | ||
| bcg729@1ad5aa5abd | ||
| build | ||
| externals | ||
| libilbc-rfc3951@a70714c2e8 | ||
| liblinphone.xcodeproj | ||
| linphone@1438d4f591 | ||
| msamr@17391e3246 | ||
| msilbc@fbb153573c | ||
| mssilk@d3a6a0a130 | ||
| msx264@6ba1b86990 | ||
| liblinphone_Prefix.pch | ||