forked from mirrors/linphone-iphone
Conflicts: Classes/ChatRoomViewController.m Classes/HistoryDetailsViewController.m Classes/HistoryTableViewController.m Classes/InCallViewController.m Classes/LinphoneAppDelegate.m Classes/LinphoneManager.m Classes/LinphoneUI/UIContactDetailsHeader.m Classes/LinphoneUI/UIHistoryCell.m Classes/PhoneMainView.m Resources/en.lproj/Localizable.strings Resources/fr.lproj/Localizable.strings Resources/ru.lproj/Localizable.strings linphone.ldb/Contents.plist linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings linphone.xcodeproj/project.pbxproj |
||
|---|---|---|
| .. | ||
| 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 | ||