linphone-iphone/Classes
Yann Diorcet 4baa727d8c Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/ContactDetailsTableViewController.m
	Classes/ContactsViewController.m
	Classes/InCallTableViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/PhoneMainView.m
	Classes/WizardViewController.m
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	linphonerc-factory
	linphonerc-factory~ipad
2012-08-23 12:07:01 +02:00
..
LinphoneUI Add animations preference 2012-08-23 10:25:23 +02:00
Model Add user/password/proxy configuration using qrcode 2012-08-21 16:21:35 +02:00
Utils Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-08-20 17:59:45 +02:00
BuschJaegerApp.xib Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
BuschJaegerCallView.h Improve incoming call 2012-08-21 11:10:35 +02:00
BuschJaegerCallView.m Improve incoming call 2012-08-21 11:10:35 +02:00
BuschJaegerCallView.xib Improve incoming call 2012-08-21 11:10:35 +02:00
BuschJaegerConfigParser.h Add user/password/proxy configuration using qrcode 2012-08-21 16:21:35 +02:00
BuschJaegerConfigParser.m Add 5s timeout in configuration download 2012-08-22 15:43:02 +02:00
BuschJaegerMainView.h Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
BuschJaegerMainView.m Improve BJ Application 2012-08-20 18:00:13 +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 Improve BJ Application 2012-08-20 18:00:13 +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 Improve BJ Application 2012-08-20 18:00:13 +02:00
BuschJaegerUtils.h Improve BJ Application 2012-08-20 18:00:13 +02:00
BuschJaegerUtils.m Improve BJ Application 2012-08-20 18:00:13 +02:00
BuschJaegerWelcomeView.h Start Welcome View 2012-08-20 13:25:15 +02:00
BuschJaegerWelcomeView.m Improve BJ Application 2012-08-20 18:00:13 +02:00
BuschJaegerWelcomeView.xib Improve BJ Application 2012-08-20 18:00:13 +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 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-08-21 15:05:14 +02:00
LinphoneManager.h Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-08-23 12:07:01 +02:00
LinphoneManager.m Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-08-23 12:07:01 +02:00