Commit graph

5 commits

Author SHA1 Message Date
Jehan Monnier
6e97edcafd Merge remote branch 'bc/master' into tunnel
Conflicts:
	.gitmodules
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
2011-04-05 18:55:49 +02:00
Jehan Monnier
a9ab705dfa add AMR support. Should be use with compilation flag HAVE_AMR 2011-04-04 14:54:28 +02:00
Jehan Monnier
a0f30669db implement tunnel 2011-03-17 12:36:25 +01:00
Jehan Monnier
d74ad2fbd5 use linphone git server for eXosip for multitasking support 2010-07-19 09:34:18 +02:00
Jehan Monnier
9a5fd64e50 add liblinphone and its dependecies as submodules 2010-07-18 22:09:23 +02:00