forked from mirrors/linphone-iphone
Conflicts: Classes/ChatRoomTableViewController.m Classes/ChatRoomViewController.m Classes/ContactDetailsTableViewController.m Classes/LinphoneCoreSettingsStore.m Classes/LinphoneManager.m Classes/LinphoneUI/UICallBar.m Classes/LinphoneUI/UICompositeViewController.m Classes/LinphoneUI/UIStateBar.m Classes/LinphoneUI/en.lproj/UICallBar.xib Classes/LinphoneUI/fr.lproj/UICallBar.xib Classes/en.lproj/ChatViewController.xib Classes/fr.lproj/ChatViewController.xib linphone.ldb/Contents.plist linphone.ldb/Resources/Classes/ChatViewController/19/ChatViewController.xib linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib linphone.xcodeproj/project.pbxproj |
||
|---|---|---|
| .. | ||
| exosip@a5af92c734 | ||
| ffmpeg@907783f221 | ||
| gsm@405fb3856f | ||
| libvpx@c8df1656bd | ||
| opencore-amr@cf4409e03e | ||
| osip@7e98a33792 | ||
| speex@a796bb048a | ||
| srtp@c01a03a478 | ||
| x264@f6a8615ab0 | ||
| zrtpcpp@9cac07ec1a | ||