Yann Diorcet
|
d2253e0532
|
Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
Classes/AboutViewController.h
Classes/AboutViewController.m
Classes/AboutViewController.xib
Classes/ChatRoomTableViewController.m
Classes/ChatRoomViewController.m
Classes/ChatTableViewController.m
Classes/ContactDetailsTableViewController.m
Classes/ContactDetailsViewController.m
Classes/ContactsTableViewController.m
Classes/HistoryDetailsViewController.m
Classes/HistoryTableViewController.m
Classes/HistoryViewController.m
Classes/ImageViewController.h
Classes/ImageViewController.m
Classes/InCallTableViewController.h
Classes/InCallTableViewController.m
Classes/InCallViewController.m
Classes/IncomingCallViewController.h
Classes/IncomingCallViewController.m
Classes/LinphoneAppDelegate.m
Classes/LinphoneCoreSettingsStore.m
Classes/LinphoneManager.m
Classes/LinphoneUI/UICallBar.m
Classes/LinphoneUI/UICallCell.h
Classes/LinphoneUI/UICallCell.m
Classes/LinphoneUI/UIChatCell.m
Classes/LinphoneUI/UIChatRoomCell.m
Classes/LinphoneUI/UIChatRoomCell.xib
Classes/LinphoneUI/UICompositeViewController.m
Classes/LinphoneUI/UIContactDetailsHeader.m
Classes/LinphoneUI/UIMainBar.m
Classes/LinphoneUI/UIStateBar.m
Classes/LinphoneUI/en.lproj/UICallBar.xib
Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib
Classes/LinphoneUI/en.lproj/UICallCell.xib
Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
Classes/LinphoneUI/fr.lproj/UICallBar.xib
Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib
Classes/LinphoneUI/fr.lproj/UICallCell.xib
Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib
Classes/PhoneMainView.m
Classes/SettingsViewController.m
Classes/WizardViewController.h
Classes/WizardViewController.m
Classes/en.lproj/DialerViewController.xib
Classes/en.lproj/IncomingCallViewController.xib
Classes/fr.lproj/DialerViewController.xib
Classes/fr.lproj/IncomingCallViewController.xib
Resources/en.lproj/Localizable.strings
Resources/fr.lproj/Localizable.strings
Settings.bundle/Root.plist
Settings/InAppSettings.bundle/en.lproj/Audio.strings
Settings/InAppSettings.bundle/fr.lproj/Audio.strings
linphone-Info.plist
linphone.ldb/Contents.plist
linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib
linphone.ldb/Resources/Classes/ImageViewController/11/ImageViewController.xib
linphone.ldb/Resources/Classes/IncomingCallViewController/9/IncomingCallViewController.xib
linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings
linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib
linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/8/UICallBar~ipad.xib
linphone.ldb/Resources/LinphoneUI/UICallCell/10/UICallCell.xib
linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/6/UIConferenceHeader.xib
linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
linphone.xcodeproj/project.pbxproj
submodules/build/builders.d/openssl.mk
|
2012-10-10 13:04:05 +02:00 |
|
Simon Morlat
|
8fac0fa65e
|
update openssl
|
2012-09-26 22:46:07 +02:00 |
|
Simon Morlat
|
ec4beba395
|
Merge remote-tracking branch 'linphone/master' into buschjaeger
Conflicts:
linphone-Info.plist
linphone.xcodeproj/project.pbxproj
|
2012-05-03 15:50:02 +02:00 |
|
Jehan Monnier
|
8a1c3000cd
|
merge vios IOS with master
|
2011-11-18 14:23:41 +01:00 |
|
Guillaume Beraudo
|
c288f87bfb
|
Patches for srtp and zrtp.
|
2011-09-06 14:51:14 +02:00 |
|
Jehan Monnier
|
13399e424a
|
migrate liblinphone sdk compilation to xcode4
|
2011-03-23 14:01:05 +01:00 |
|
Jehan Monnier
|
661853b70a
|
fix openssl build
|
2011-03-18 20:55:06 +01:00 |
|
Jehan Monnier
|
b558703c8f
|
add build script for open ssl
|
2011-03-18 20:18:34 +01:00 |
|