linphone-ios/Classes/Utils
Yann Diorcet 7473c4dd17 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/AboutViewController.h
	Classes/AboutViewController.m
	Classes/AboutViewController.xib
	Classes/ContactDetailsTableViewController.m
	Classes/ContactsTableViewController.m
	Classes/ContactsViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactCell.m
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/PhoneMainView.xib
	Classes/SettingsViewController.m
	Classes/WizardViewController.m
	Classes/en.lproj/ContactDetailsLabelViewController.xib
	Classes/en.lproj/ContactDetailsViewController.xib
	Classes/en.lproj/ContactsViewController.xib
	Classes/fr.lproj/ContactDetailsLabelViewController.xib
	Classes/fr.lproj/ContactDetailsViewController.xib
	Classes/fr.lproj/ContactsViewController.xib
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
	submodules/externals/exosip
2013-01-10 16:38:25 +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
UIDeviceAddition Add instance param in registers 2012-12-12 09:14:44 +01: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 previous commit (if no port it's return "sip") 2012-11-21 17:10:12 +01: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 Improve battery warning 2012-12-07 11:01:34 +01:00