witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/Classes/Utils
History
Yann Diorcet 939d8619a0 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/BuschJaegerHistoryView.xib
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/ChatViewController.h
	Classes/ChatViewController.m
	Classes/ChatViewController.xib
	Classes/ConsoleViewController.h
	Classes/ConsoleViewController.m
	Classes/ConsoleViewController.xib
	Classes/DialerViewController.m
	Classes/FirstLoginViewController.m
	Classes/HistoryDetailsViewController.h
	Classes/HistoryDetailsViewController.m
	Classes/HistoryTableViewController.h
	Classes/HistoryViewController.h
	Classes/HistoryViewController.m
	Classes/InCallTableViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneCoreSettingsStore.h
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.h
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactDetailsFooter.xib
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UIHistoryDetailsCell.xib
	Classes/LinphoneUI/UIStateBar.m
	Classes/LinphoneUI/UIStateBar.xib
	Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib
	Classes/LinphoneUI/en.lproj/UICallCell.xib
	Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
	Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/en.lproj/UIMainBar.xib
	Classes/Model/ChatModel.h
	Classes/Model/ChatModel.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.h
	Classes/SettingsViewController.m
	Classes/Utils/FastAddressBook.m
	Classes/WizardViewController.m
	Classes/en.lproj/DialerViewController.xib
	Classes/en.lproj/FirstLoginViewController.xib
	Classes/en.lproj/HistoryViewController.xib
	Classes/en.lproj/InCallViewController.xib
	Resources/chat_add_default.png
	Resources/chat_add_over.png
	Resources/chat_back_default.png
	Resources/chat_back_over.png
	Resources/chat_edit_default.png
	Resources/chat_edit_over.png
	Resources/chat_ok_default.png
	Resources/chat_ok_over.png
	Resources/contact_back_default.png
	Resources/contact_back_over.png
	Resources/contact_cancel_default.png
	Resources/contact_cancel_over.png
	Resources/contact_edit_default.png
	Resources/contact_edit_over.png
	Resources/contact_ok_default.png
	Resources/contact_ok_disabled.png
	Resources/contacts_add_default.png
	Resources/contacts_add_over.png
	Resources/en.lproj/Localizable.strings
	Resources/history_details_add_default.png
	Resources/history_details_add_over.png
	Resources/history_details_back_default.png
	Resources/history_details_back_over.png
	Resources/history_edit_default.png
	Resources/history_edit_over.png
	Resources/history_ok_default.png
	Resources/history_ok_over.png
	Resources/linphonerc-factory
	Settings.bundle/video.plist
	Settings/InAppSettings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Call.plist
	linphone-Info.plist
	linphone.ldb/Resources/Classes/ChatRoomViewController/1/ChatRoomViewController.xib
	linphone.ldb/Resources/Classes/ChatViewController/1/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/1/ContactDetailsLabelViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/ContactsViewController/1/ContactsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController~ipad/2/DialerViewController~ipad.xib
	linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib
	linphone.ldb/Resources/Classes/IncomingCallViewController/1/IncomingCallViewController.xib
	linphone.ldb/Resources/Classes/WizardViewController/2/WizardViewController.xib
	linphone.ldb/Resources/LinphoneUI/UICallBar/2/UICallBar.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/1/UIContactDetailsFooter.xib
	linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/2/UIMainBar~ipad.xib
	linphone.xcodeproj/project.pbxproj
	submodules/linphone
2012-09-11 15:31:29 +02:00
..
TPMultiLayoutViewController Fix Dialer button in dialer bar 2012-07-25 18:25:13 +02:00
UACellBackgroundView Improve UACellBackgroundView 2012-08-20 17:56:10 +02:00
ZBarSDK Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
ColorSpaceUtilites.m Fix Color stuff for IOS4 2012-07-27 12:07:05 +02:00
ColorSpaceUtilities.h Fix Color stuff for IOS4 2012-07-27 12:07:05 +02:00
FastAddressBook.h Simplification of view changes 2012-07-18 15:23:49 +02:00
FastAddressBook.m rework on settings store 2012-09-05 10:37:39 +02:00
OrderedDictionary.h Rename classes ... split buttons enable/disable stuff 2012-06-14 18:31:09 +02:00
OrderedDictionary.m Rename classes ... split buttons enable/disable stuff 2012-06-14 18:31:09 +02:00
Utils.h Clean Linphone Manager 2012-07-17 10:48:14 +02:00
Utils.m Clean Linphone Manager 2012-07-17 10:48:14 +02:00