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 |
||
|---|---|---|
| .. | ||
| bcg729@1ad5aa5abd | ||
| build | ||
| externals | ||
| libilbc-rfc3951@a70714c2e8 | ||
| liblinphone.xcodeproj | ||
| linphone@2584c08c31 | ||
| msamr@17391e3246 | ||
| msilbc@fbb153573c | ||
| mssilk@1d81e34d6e | ||
| msx264@f1fd3d6be8 | ||
| liblinphone_Prefix.pch | ||