Simon Morlat 4e2de700fb Merge branch 'master' into tunnel ... Conflicts: .gitmodules Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj submodules/build/Makefile submodules/build/builder-iphone-os.mk		2012-03-16 15:50:55 +01:00
..
bcg729@1ad5aa5abd	g729A integration based on bcg729	2012-02-16 15:46:45 +01:00
build	Merge branch 'master' into tunnel	2012-03-16 15:50:55 +01:00
externals	update exosip	2012-03-06 11:17:47 +01:00
libilbc-rfc3951@af32518af4	update to the latest libilbc project	2011-09-19 10:08:45 +02:00
liblinphone.xcodeproj	update with new tunnel api	2011-12-22 14:18:21 +01:00
linphone@ffe1d65f34	update exosip and liblinphone for eXosip_trylock() improvemnt	2012-03-05 17:10:45 +01:00
msamr@17391e3246	add AMR support. Should be use with compilation flag HAVE_AMR	2011-04-04 14:54:28 +02:00
msilbc@3d49d56a59	add msilbc submodule	2010-07-19 11:26:16 +02:00
mssilk@a0ad1cca90	Update silk and linphone	2012-02-09 11:38:22 +01:00
msx264@6ba1b86990	Merge remote-tracking branch 'public/master' into dev_videoios	2011-10-19 11:36:27 +02:00
tunnel@16c233f6a0	fix tunnel reference	2012-02-01 11:25:26 +01:00
liblinphone_Prefix.pch	start liblinphone xcode integration	2010-07-22 17:48:57 +02:00