linphone-ios/Settings.bundle
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
..
en.lproj many bugfixes, work in progress 2012-06-12 00:38:34 +02:00
Advanced.plist Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-08-23 12:07:01 +02:00
audio.plist many bugfixes, work in progress 2012-06-12 00:38:34 +02:00
Root.plist Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
video.plist many bugfixes, work in progress 2012-06-12 00:38:34 +02:00