witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/submodules
History
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
..
bcg729@1ad5aa5abd g729A integration based on bcg729 2012-02-16 15:46:45 +01:00
build Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-11-20 14:32:54 +01:00
externals check certificate CN name 2012-12-14 09:55:12 +01:00
libilbc-rfc3951@a70714c2e8 Clean code 2012-08-17 12:39:18 +02:00
liblinphone.xcodeproj Fix liblinphone 2012-10-05 10:44:05 +02:00
linphone@ebf0b1897a Update linphone submodule for ICE fix. 2012-12-17 16:34:05 +01:00
msamr@17391e3246 add AMR support. Should be use with compilation flag HAVE_AMR 2011-04-04 14:54:28 +02:00
msilbc@fbb153573c set submodules to correct versions 2012-04-17 11:47:05 +02:00
mssilk@1d81e34d6e activate edge mode 2012-09-14 17:55:07 +02:00
msx264@f1fd3d6be8 update msx264 (required to fix VFU request) 2012-12-21 10:22:51 +01:00
liblinphone_Prefix.pch start liblinphone xcode integration 2010-07-22 17:48:57 +02:00