Yann Diorcet 233f22e5d7 Merge branch 'master' into tunnel ... Conflicts: Classes/LinphoneUI/LinphoneManager.h Classes/LinphoneUI/LinphoneManager.m Settings.bundle/Root.plist Settings/InAppSettings.bundle/Root.plist linphone.xcodeproj/project.pbxproj submodules/build/builders.d/x264.mk		2013-01-15 12:58:42 +01:00
..
bcg729@1ad5aa5abd	g729A integration based on bcg729	2012-02-16 15:46:45 +01:00
build	Merge branch 'master' into tunnel	2013-01-15 12:58:42 +01:00
externals	Update x264 submodule for crash fix on iOS 6.	2012-12-19 11:29:58 +01:00
libilbc-rfc3951@a70714c2e8	update ilbc codec to workaround google's failure to use correct TLS certificateson its machine.	2012-06-08 22:07:43 +02:00
liblinphone.xcodeproj	Fix liblinphone	2012-10-05 10:44:05 +02:00
linphone@d6b9b813eb	Merge branch 'master' into tunnel	2013-01-15 12:58:42 +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	Fix SILK compilation issue	2012-10-31 21:38:33 +01:00
msx264@f1fd3d6be8	update msx264 (required to fix VFU request)	2012-12-21 10:22:51 +01:00
tunnel@cfb81dd5a9	Update tunnel submodule to fix compilation on armv7s-apple-darwin architecture.	2012-12-17 14:13:25 +01:00
liblinphone_Prefix.pch	start liblinphone xcode integration	2010-07-22 17:48:57 +02:00