forked from mirrors/linphone-iphone
Conflicts: Classes/AboutViewController.h Classes/AboutViewController.m Classes/AboutViewController.xib Classes/ContactDetailsTableViewController.m Classes/ContactsTableViewController.m Classes/ContactsViewController.m Classes/LinphoneCoreSettingsStore.m Classes/LinphoneManager.m Classes/LinphoneUI/UICompositeViewController.m Classes/LinphoneUI/UIContactCell.m Classes/LinphoneUI/UIContactDetailsHeader.m Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib Classes/PhoneMainView.h Classes/PhoneMainView.m Classes/PhoneMainView.xib Classes/SettingsViewController.m Classes/WizardViewController.m Classes/en.lproj/ContactDetailsLabelViewController.xib Classes/en.lproj/ContactDetailsViewController.xib Classes/en.lproj/ContactsViewController.xib Classes/fr.lproj/ContactDetailsLabelViewController.xib Classes/fr.lproj/ContactDetailsViewController.xib Classes/fr.lproj/ContactsViewController.xib Resources/en.lproj/Localizable.strings Resources/fr.lproj/Localizable.strings linphone.ldb/Contents.plist linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings linphone.xcodeproj/project.pbxproj submodules/externals/exosip |
||
|---|---|---|
| .. | ||
| CAAnimationBlocks | ||
| DTFoundation | ||
| GrowingTextView | ||
| TPMultiLayoutViewController | ||
| UACellBackgroundView | ||
| UIDeviceAddition | ||
| ZBarSDK | ||
| ColorSpaceUtilites.m | ||
| ColorSpaceUtilities.h | ||
| FastAddressBook.h | ||
| FastAddressBook.m | ||
| NSURLConnection+SynchronousDelegate.h | ||
| NSURLConnection+SynchronousDelegate.m | ||
| OrderedDictionary.h | ||
| OrderedDictionary.m | ||
| Utils.h | ||
| Utils.m | ||