linphone-iphone/Classes
Yann Diorcet 7473c4dd17 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/AboutViewController.h
	Classes/AboutViewController.m
	Classes/AboutViewController.xib
	Classes/ContactDetailsTableViewController.m
	Classes/ContactsTableViewController.m
	Classes/ContactsViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactCell.m
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/PhoneMainView.xib
	Classes/SettingsViewController.m
	Classes/WizardViewController.m
	Classes/en.lproj/ContactDetailsLabelViewController.xib
	Classes/en.lproj/ContactDetailsViewController.xib
	Classes/en.lproj/ContactsViewController.xib
	Classes/fr.lproj/ContactDetailsLabelViewController.xib
	Classes/fr.lproj/ContactDetailsViewController.xib
	Classes/fr.lproj/ContactsViewController.xib
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
	submodules/externals/exosip
2013-01-10 16:38:25 +01:00
..
LinphoneUI Fix wrongly showed image in history 2013-01-10 15:38:37 +01:00
Model fix history station bug 2012-11-22 16:34:58 +01:00
Utils Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2013-01-10 16:38:25 +01:00
BuschJaegerApp.xib Fix rotation 2012-11-23 11:36:33 +01:00
BuschJaegerCallView.h Fix accept call button 2012-11-12 11:59:38 +01:00
BuschJaegerCallView.m Merge branch 'buschjaeger_new_ui' of git.linphone.org:linphone-iphone-buschjaeger into buschjaeger_new_ui 2013-01-10 12:04:10 +01:00
BuschJaegerCallView.xib Fix accept call button 2012-11-12 11:59:38 +01:00
BuschJaegerConfiguration.h Fix history reload on fail (ipad) 2012-12-13 17:01:25 +01:00
BuschJaegerConfiguration.m enable locking of light switch 2013-01-10 09:08:03 +01:00
BuschJaegerHistoryDetailsView.h Fix accept call button 2012-11-12 11:59:38 +01:00
BuschJaegerHistoryDetailsView.m Fix rotation 2012-11-27 10:07:50 +01:00
BuschJaegerHistoryDetailsView.xib UI changes 2012-11-20 16:54:57 +01:00
BuschJaegerHistoryTableViewController.h Add ringtone settings 2012-09-12 11:25:36 +02:00
BuschJaegerHistoryTableViewController.m Fix history reload on fail (ipad) 2012-12-13 17:01:25 +01:00
BuschJaegerHistoryView.h Add history details view 2012-08-24 14:25:43 +02:00
BuschJaegerHistoryView.m App does not indicate missed calls in App icon 2012-12-04 12:07:18 +01:00
BuschJaegerHistoryView.xib Add history and station in welcome view on ipad 2012-11-28 11:24:21 +01:00
BuschJaegerMainView.h App does not indicate missed calls in App icon 2012-12-04 12:07:18 +01:00
BuschJaegerMainView.m Reconfigure proxy on network change 2013-01-10 16:27:30 +01:00
BuschJaegerMainView.xib Fix rotation 2012-11-23 11:36:33 +01:00
BuschJaegerManualSettingsView.h Add manual settings view 2012-10-22 17:06:49 +02:00
BuschJaegerManualSettingsView.m Fix rotation 2012-11-27 10:07:50 +01:00
BuschJaegerManualSettingsView.xib Add manual settings view 2012-10-22 17:06:49 +02:00
BuschJaegerSettingsView.h Add manual settings view 2012-10-22 17:06:49 +02:00
BuschJaegerSettingsView.m Fix zbar on iPad 2012-12-13 17:21:36 +01:00
BuschJaegerSettingsView.xib Add manual settings view 2012-10-22 17:06:49 +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 Fix gradients resize 2012-11-28 10:55:06 +01:00
BuschJaegerUtils.m Fix gradients resize 2012-11-28 10:55:06 +01:00
BuschJaegerWelcomeView.h Fix history reload on fail (ipad) 2012-12-13 17:01:25 +01:00
BuschJaegerWelcomeView.m Fix history reload on fail (ipad) 2012-12-13 17:01:25 +01:00
BuschJaegerWelcomeView.xib Add history and station in welcome view on ipad 2012-11-28 11:24:21 +01:00
BuschJaegerWelcomeView~ipad.xib Add history and station in welcome view on ipad 2012-11-28 11:24:21 +01: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 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2013-01-10 16:38:25 +01:00
LinphoneManager.h Reconfigure proxy on network change 2013-01-10 16:27:30 +01:00
LinphoneManager.m Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2013-01-10 16:38:25 +01:00