Simon Morlat 9af95dc58e Merge remote-tracking branch 'origin/master' into tunnel ... Conflicts: Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj submodules/build/Makefile submodules/externals/exosip submodules/liblinphone.xcodeproj/project.pbxproj submodules/linphone submodules/mssilk		2012-04-26 15:09:04 +02:00
..
bcg729@1ad5aa5abd	g729A integration based on bcg729	2012-02-16 15:46:45 +01:00
build	Merge remote-tracking branch 'origin/master' into tunnel	2012-04-26 15:09:04 +02:00
externals	Restore proper libvpx version	2012-04-25 14:37:03 +02:00
libilbc-rfc3951@af32518af4	update to the latest libilbc project	2011-09-19 10:08:45 +02:00
liblinphone.xcodeproj	update ms2 with fixes for iounit	2012-04-11 14:27:57 +02:00
linphone@38d4730be5	Merge remote-tracking branch 'origin/master' into tunnel	2012-04-26 15:09:04 +02: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@391b6d6b0f	set submodules to correct versions	2012-04-17 11:47:05 +02:00
msx264@6ba1b86990	Merge remote-tracking branch 'public/master' into dev_videoios	2011-10-19 11:36:27 +02:00
tunnel@21de31a17e	Merge remote-tracking branch 'origin/master' into tunnel	2012-04-26 15:09:04 +02:00
liblinphone_Prefix.pch	start liblinphone xcode integration	2010-07-22 17:48:57 +02:00