witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/Classes/Utils
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
..
TPMultiLayoutViewController Fix Dialer button in dialer bar 2012-07-25 18:25:13 +02:00
UACellBackgroundView Remove useless variables (with property defined) 2012-08-20 13:23:03 +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 Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +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