linphone-ios/Classes/Utils
Yann Diorcet e541869c96 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/ChatRoomViewController.m
	Classes/ContactsViewController.m
	Classes/HistoryDetailsViewController.h
	Classes/HistoryDetailsViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatCell.xib
	Classes/LinphoneUI/UICompositeViewController.h
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Classes/WizardViewController.m
	Classes/en.lproj/ChatViewController.xib
	Classes/en.lproj/ContactDetailsViewController.xib
	Classes/en.lproj/DialerViewController.xib
	Classes/en.lproj/FirstLoginViewController.xib
	Classes/en.lproj/HistoryDetailsViewController.xib
	Classes/fr.lproj/ChatRoomViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	Classes/fr.lproj/ContactDetailsViewController.xib
	Classes/fr.lproj/DialerViewController.xib
	Classes/fr.lproj/FirstLoginViewController.xib
	Classes/fr.lproj/HistoryDetailsViewController.xib
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/linphonerc-factory
	Resources/linphonerc-factory~ipad
	Settings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Call.plist
	Settings/InAppSettings.bundle/en.lproj/Audio.strings
	Settings/InAppSettings.bundle/en.lproj/Call.strings
	Settings/InAppSettings.bundle/en.lproj/Root.strings
	Settings/InAppSettings.bundle/fr.lproj/Audio.strings
	Settings/InAppSettings.bundle/fr.lproj/Call.strings
	Settings/InAppSettings.bundle/fr.lproj/Video.strings
	linphone-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatViewController/17/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController/6/DialerViewController.xib
	linphone.ldb/Resources/Classes/FirstLoginViewController/6/FirstLoginViewController.xib
	linphone.ldb/Resources/Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings
	linphone.ldb/Resources/InAppSettings.bundle/Call/1/Call.strings
	linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
	linphone.ldb/Resources/InAppSettings.bundle/Root/1/Root.strings
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
	submodules/linphone
2012-11-07 11:15:31 +01:00
..
CAAnimationBlocks Fix animations 2012-10-01 15:22:55 +02:00
DTFoundation Improve ChatRoomView 2012-09-14 16:51:41 +02:00
GrowingTextView Fix chat progress bar for iOS4 2012-09-24 15:28:25 +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 Update ZbarSDK 2012-09-26 14:33:13 +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 Update addressbook stuff. Show alert when access declined 2012-10-16 11:30:59 +02:00
FastAddressBook.m Fix Addressbook when no proxy configured 2012-10-17 15:25:40 +02:00
NSURLConnection+SynchronousDelegate.h Add synchronous NSURLConnection with delegate 2012-10-02 16:34:37 +02:00
NSURLConnection+SynchronousDelegate.m Add synchronous NSURLConnection with delegate 2012-10-02 16:34:37 +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 iPad incoming call view 2012-09-27 11:38:24 +02:00
Utils.m iPad incoming call view 2012-09-27 11:38:24 +02:00