linphone-iphone/Resources
Yann Diorcet b7b80681ad Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/BuschJaegerCallView.h
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/ChatViewController.m
	Classes/ContactDetailsImagePickerController.h
	Classes/DialerViewController.h
	Classes/DialerViewController.m
	Classes/ImagePickerViewController.h
	Classes/ImageViewController.h
	Classes/ImageViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactDetailsHeader.h
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UILightButton.h
	Classes/LinphoneUI/UIStateBar.m
	Classes/Model/ChatModel.h
	Classes/Model/ChatModel.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Classes/en.lproj/ChatRoomViewController.xib
	Classes/en.lproj/ChatViewController.xib
	Classes/en.lproj/DialerViewController~ipad.xib
	Classes/en.lproj/HistoryViewController.xib
	Classes/en.lproj/InCallViewController.xib
	Classes/en.lproj/WizardViewController.xib
	Classes/fr.lproj/ChatRoomViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	Classes/fr.lproj/DialerViewController~ipad.xib
	Classes/fr.lproj/HistoryViewController.xib
	Classes/fr.lproj/WizardViewController.xib
	Resources/chat_field.9.png
	Resources/chat_field.9@2x.png
	Resources/chat_send_default.png
	Resources/chat_send_disabled.png
	Resources/chat_send_over.png
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/linphonerc-factory~ipad
	Settings.bundle/Advanced.plist
	Settings.bundle/video.plist
	Settings/InAppSettings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Call.plist
	Settings/InAppSettings.bundle/en.lproj/Advanced.strings
	Settings/InAppSettings.bundle/en.lproj/Root.strings
	Settings/InAppSettings.bundle/en.lproj/Video.strings
	Settings/InAppSettings.bundle/fr.lproj/Advanced.strings
	Settings/InAppSettings.bundle/fr.lproj/Root.strings
	Settings/InAppSettings.bundle/fr.lproj/Video.strings
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatRoomViewController/17/ChatRoomViewController.xib
	linphone.ldb/Resources/Classes/ChatViewController/3/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib
	linphone.ldb/Resources/Classes/HistoryViewController/2/HistoryViewController.xib
	linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib
	linphone.ldb/Resources/Classes/WizardViewController/3/WizardViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Advanced/1/Advanced.strings
	linphone.ldb/Resources/InAppSettings.bundle/Root/1/Root.strings
	linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
2012-09-19 10:47:11 +02:00
..
en.lproj Add Image in chat 2012-09-18 16:52:52 +02:00
background_alt.png Add preview in dialer view on iPad 2012-09-14 11:13:18 +02:00
bj_barcode.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_decline.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_door.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_door_hl.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_end_call.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_history.png Start history view 2012-08-23 16:18:24 +02:00
bj_light.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_light_hl.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_mute_off.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_mute_on.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_save.png Add snapshot + save button 2012-09-12 14:34:26 +02:00
bj_settings.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_start_call.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_station.png Start history view 2012-08-23 16:18:24 +02:00
buschjaeger_icon_57.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
buschjaeger_icon_57@2x.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
buschjaeger_icon_72.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
buschjaeger_icon_72@2x.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
buschjaeger_icon_512.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
chat_background.9.png Add growning multiline in chatroom 2012-09-13 16:58:18 +02:00
chat_background.9@2x.png Add growning multiline in chatroom 2012-09-13 16:58:18 +02:00
chat_background.png Add growning multiline in chatroom 2012-09-13 16:58:18 +02:00
image_back_default.png Add settings for wizard 2012-09-18 17:27:34 +02:00
image_back_over.png Add settings for wizard 2012-09-18 17:27:34 +02:00
iTunesArtwork add ituneArtWork 2011-02-09 10:43:45 +01:00
linphonerc Improve settings 2012-09-18 12:25:06 +02:00
linphonerc-factory Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-09-19 10:47:11 +02:00
linphonerc-factory~ipad Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-09-19 10:47:11 +02:00
linphonerc~ipad Improve settings 2012-09-18 12:25:06 +02:00
ringtone_01_1600.wav Add ringtone settings 2012-09-12 11:25:36 +02:00
ringtone_01_1600_loop.wav Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
ringtone_02_1600.wav Add ringtone settings 2012-09-12 11:25:36 +02:00
ringtone_02_1600_loop.wav Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
ringtone_03_1600.wav Add ringtone settings 2012-09-12 11:25:36 +02:00
ringtone_03_1600_loop.wav Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
ringtone_04_1600.wav Add ringtone settings 2012-09-12 11:25:36 +02:00
ringtone_04_1600_loop.wav Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
ringtone_05_1600.wav Add ringtone settings 2012-09-12 11:25:36 +02:00
ringtone_05_1600_loop.wav Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
rootca.pem add godaddy root ca 2012-07-31 10:26:31 +02:00
snapshot.png Add snapshot + save button 2012-09-12 14:34:26 +02:00
trash.png Add ringtone settings 2012-09-12 11:25:36 +02:00