mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linphone-iphone/Classes
History
Yann Diorcet 9ede4efa30 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomViewController.h
	Classes/ChatViewController.h
	Classes/ConsoleViewController.h
	Classes/ContactDetailsLabelViewController.h
	Classes/ContactDetailsLabelViewController.m
	Classes/ContactDetailsTableViewController.h
	Classes/ContactDetailsTableViewController.m
	Classes/ContactDetailsViewController.h
	Classes/ContactDetailsViewController.m
	Classes/ContactsTableViewController.h
	Classes/ContactsViewController.h
	Classes/DialerViewController.h
	Classes/FirstLoginViewController.h
	Classes/HistoryDetailsViewController.h
	Classes/HistoryTableViewController.h
	Classes/HistoryTableViewController.m
	Classes/HistoryViewController.h
	Classes/InCallTableViewController.m
	Classes/InCallViewController.h
	Classes/IncomingCallViewController.h
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.h
	Classes/LinphoneUI/UICallBar.h
	Classes/LinphoneUI/UICallCell.h
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.h
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UICompositeViewController.h
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIConferenceHeader.h
	Classes/LinphoneUI/UIContactCell.h
	Classes/LinphoneUI/UIContactDetailsFooter.h
	Classes/LinphoneUI/UIContactDetailsHeader.h
	Classes/LinphoneUI/UIHistoryCell.h
	Classes/LinphoneUI/UIMainBar.h
	Classes/LinphoneUI/UIStateBar.h
	Classes/Model/ChatModel.m
	Classes/Model/OutdoorStation.m
	Classes/MoreViewController.h
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.h
	Classes/SettingsViewController.m
	Classes/WizardViewController.h
	nogpl-thirdparties/Settings.bundle/Advanced.plist
2012-08-20 13:27:38 +02:00
..
LinphoneUI Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-08-20 13:27:38 +02:00
Model Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
Utils Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-08-20 13:27:38 +02:00
BuschJaegerApp.xib Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
BuschJaegerCallView.h Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
BuschJaegerCallView.m Clean up 2012-08-20 11:50:51 +02:00
BuschJaegerCallView.xib Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
BuschJaegerConfigParser.h Continue Work 2012-08-17 15:31:20 +02:00
BuschJaegerConfigParser.m Clean up 2012-08-20 11:50:51 +02:00
BuschJaegerMainView.h Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
BuschJaegerMainView.m Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
BuschJaegerMainView.xib Start Welcome View 2012-08-20 13:25:15 +02:00
BuschJaegerSettingsView.h Clean code 2012-08-17 12:39:18 +02:00
BuschJaegerSettingsView.m Start Welcome View 2012-08-20 13:25:15 +02:00
BuschJaegerSettingsView.xib Continue Work 2012-08-17 15:31:20 +02:00
BuschJaegerStationViewController.h Start Welcome View 2012-08-20 13:25:15 +02:00
BuschJaegerStationViewController.m Start Welcome View 2012-08-20 13:25:15 +02:00
BuschJaegerUtils.h Clean code 2012-08-17 12:39:18 +02:00
BuschJaegerUtils.m Clean code 2012-08-17 12:39:18 +02:00
BuschJaegerWelcomeView.h Start Welcome View 2012-08-20 13:25:15 +02:00
BuschJaegerWelcomeView.m Start Welcome View 2012-08-20 13:25:15 +02:00
BuschJaegerWelcomeView.xib Start Welcome View 2012-08-20 13:25:15 +02:00
CallDelegate.h Use new_ui branch version of CallDelegate 2012-08-20 11:53:23 +02:00
CallDelegate.m Use new_ui branch version of CallDelegate 2012-08-20 11:53:23 +02:00
LinphoneAppDelegate.h Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
LinphoneAppDelegate.m Clean up 2012-08-20 11:50:51 +02:00
LinphoneManager.h Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-08-20 13:27:38 +02:00
LinphoneManager.m Start Welcome View 2012-08-20 13:25:15 +02:00