mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-27 16:09:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linphone-iphone/Classes
History
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
..
LinphoneUI Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00
Model Add DER/PEM 2012-10-10 12:19:20 +02:00
Utils Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00
BuschJaegerApp.xib Add history details view 2012-08-24 14:25:43 +02:00
BuschJaegerCallView.h Fix for iPad version 2012-09-17 15:05:34 +02:00
BuschJaegerCallView.m Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00
BuschJaegerCallView.xib Fix for iPad version 2012-09-17 15:05:34 +02:00
BuschJaegerConfiguration.h Add synchronous NSURLConnection with delegate 2012-10-02 16:34:37 +02:00
BuschJaegerConfiguration.m Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00
BuschJaegerHistoryDetailsView.h Add snapshot + save button 2012-09-12 14:34:26 +02:00
BuschJaegerHistoryDetailsView.m Add snapshot + save button 2012-09-12 14:34:26 +02:00
BuschJaegerHistoryDetailsView.xib Fix for iPad version 2012-09-17 15:05:34 +02:00
BuschJaegerHistoryTableViewController.h Add ringtone settings 2012-09-12 11:25:36 +02:00
BuschJaegerHistoryTableViewController.m Add ringtone settings 2012-09-12 11:25:36 +02:00
BuschJaegerHistoryView.h Add history details view 2012-08-24 14:25:43 +02:00
BuschJaegerHistoryView.m Add ringtone settings 2012-09-12 11:25:36 +02:00
BuschJaegerHistoryView.xib Add synchronous NSURLConnection with delegate 2012-10-02 16:34:37 +02:00
BuschJaegerMainView.h Add synchronous NSURLConnection with delegate 2012-10-02 16:34:37 +02:00
BuschJaegerMainView.m Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00
BuschJaegerMainView.xib Add synchronous NSURLConnection with delegate 2012-10-02 16:34:37 +02:00
BuschJaegerSettingsView.h Start history view 2012-08-23 16:18:24 +02:00
BuschJaegerSettingsView.m Add history details view 2012-08-24 14:25:43 +02:00
BuschJaegerSettingsView.xib Add synchronous NSURLConnection with delegate 2012-10-02 16:34:37 +02:00
BuschJaegerStationTableViewController.h Start history view 2012-08-23 16:18:24 +02:00
BuschJaegerStationTableViewController.m Add user surveillance/opendoor/switchlight authorizations 2012-09-12 12:39:13 +02:00
BuschJaegerUtils.h Add user surveillance/opendoor/switchlight authorizations 2012-09-12 12:39:13 +02:00
BuschJaegerUtils.m Add user surveillance/opendoor/switchlight authorizations 2012-09-12 12:39:13 +02:00
BuschJaegerWelcomeView.h Start history view 2012-08-23 16:18:24 +02:00
BuschJaegerWelcomeView.m Add synchronous NSURLConnection with delegate 2012-10-02 16:34:37 +02:00
BuschJaegerWelcomeView.xib Fix for iPad version 2012-09-17 15:05:34 +02:00
LinphoneAppDelegate.h Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00
LinphoneAppDelegate.m Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00
LinphoneManager.h Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00
LinphoneManager.m Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00