witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/submodules
History
Yann Diorcet 6d631eb308 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ChatRoomViewController.m
	Classes/HistoryDetailsViewController.m
	Classes/IncomingCallViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.xib
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Resources/linphonerc-factory~ipad
	Settings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/en.lproj/Network.strings
	Settings/InAppSettings.bundle/fr.lproj/Network.strings
	buschjaeger-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
	linphone.xcodeproj/project.pbxproj
2012-12-04 11:59:31 +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 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-11-20 14:32:54 +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@3c4bd90ba3 Update linphone submodule 2012-12-04 11:52:49 +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@6ba1b86990 Merge remote-tracking branch 'public/master' into dev_videoios 2011-10-19 11:36:27 +02:00
liblinphone_Prefix.pch start liblinphone xcode integration 2010-07-22 17:48:57 +02:00