Commit graph

419 commits

Author SHA1 Message Date
Yann Diorcet
e6f7074a2c Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-28 10:48:01 +01:00
Yann Diorcet
d0b4e78fa0 Update linphone submodule 2013-02-28 10:47:07 +01:00
Yann Diorcet
a353c78d37 Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 15:11:58 +01:00
Yann Diorcet
468a422da8 Update linphone submodule 2013-02-25 15:11:00 +01:00
Yann Diorcet
f828243898 Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 15:06:55 +01:00
Yann Diorcet
34eab687a6 Update linphone submodule 2013-02-25 15:05:55 +01:00
Yann Diorcet
3b2a227390 Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 15:02:02 +01:00
Yann Diorcet
c161ce004e Update linphone submodule 2013-02-25 15:01:06 +01:00
Yann Diorcet
7e590522ba Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 11:56:27 +01:00
Yann Diorcet
9bf3051c97 Update linphone submodule 2013-02-25 11:36:56 +01:00
Yann Diorcet
5d4b70f111 Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 09:29:09 +01:00
Simon Morlat
33b8ba4f66 update msilbc submodule, for PLC implementation. 2013-02-22 21:31:56 +01:00
Simon Morlat
aba520dc5d update linphone submodule for new conference recording api. 2013-02-22 21:29:06 +01:00
Yann Diorcet
1ab3c5ac8e Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-22 16:50:02 +01:00
Yann Diorcet
15b773bfc5 Update linphone submodule 2013-02-22 16:48:04 +01:00
Yann Diorcet
48792a7fcd Update belle-sip and linphone submodules 2013-02-22 16:14:38 +01:00
Yann Diorcet
c2857cf5fc Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-21 12:19:48 +01:00
Simon Morlat
faa0900c9e update linphone submodule because of crash 2013-02-20 14:33:37 +01:00
Yann Diorcet
bf90e09515 Update linphone and belle-sip submodule 2013-02-20 10:35:44 +01:00
Simon Morlat
e60c6dff1c echo calibration is now optional (not required for already calibrated models).
change a few default settings.
2013-02-19 17:53:15 +01:00
Yann Diorcet
2a302a66ab Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	.gitmodules
	submodules/linphone
2013-02-13 17:26:07 +01:00
Yann Diorcet
7defe94fc5 Add libupnp dependency for Android 2013-02-13 16:53:50 +01:00
Yann Diorcet
aa71a4cd9f Merge branch 'bellesip' of git.linphone.org:linphone-android-private into bellesip 2013-02-13 12:00:25 +01:00
Yann Diorcet
3f3e9d7820 Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-13 11:59:52 +01:00
Yann Diorcet
ea897fbe56 Update linphone submodule 2013-02-13 11:58:33 +01:00
Ghislain MARY
ff18049688 Update belle-sip submodule for resolver. 2013-02-12 15:57:27 +01:00
Yann Diorcet
57a9defc31 Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-12 14:15:24 +01:00
Yann Diorcet
ff024ed59a Update linphone submodule 2013-02-12 14:14:24 +01:00
Yann Diorcet
725b516ddf Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-12 13:18:18 +01:00
Yann Diorcet
c5ccc96991 Sync at the end of remote provisioning 2013-02-12 12:55:23 +01:00
Yann Diorcet
0a4f1039b2 Update belle-sip submodule 2013-02-12 10:55:45 +01:00
Yann Diorcet
7d0dd35a2e Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/externals/exosip
	submodules/linphone
2013-02-12 10:38:57 +01:00
Ghislain MARY
f014edb972 Update linphone submodule. 2013-02-11 12:12:53 +01:00
Simon Morlat
d4f9f711f8 update exosip and linphone 2013-02-08 17:29:41 +01:00
Simon Morlat
ce3697a66c update linphone submodule 2013-02-07 18:47:43 +01:00
Yann Diorcet
c46c595ae7 Update linphone submodule 2013-02-07 15:39:23 +01:00
Simon Morlat
6491500af1 adapt to small api changes 2013-02-07 15:35:39 +01:00
Yann Diorcet
269891ebbf Update linphone submodule 2013-02-07 15:18:47 +01:00
Yann Diorcet
0408e3eae8 Merge branch 'master' into bellesip
Conflicts:
	.gitmodules
	Makefile
	submodules/externals/build/exosip/Android.mk
	submodules/externals/exosip
	submodules/linphone
2013-02-06 12:22:28 +01:00
Yann Diorcet
2f6a101e54 Add xml2lpc/lpc2xml support and remote provisioning 2013-02-05 10:04:00 +01:00
Simon Morlat
e3bb3b72e1 fix incorrect state name
update linphone submodule
2013-01-30 13:56:35 +01:00
Sylvain Berfini
79a6e9c9be Increased socket progress timeout from 1s to 5s in exosip + remove -D from Makefile 2013-01-29 13:59:07 +01:00
Ghislain MARY
596250313a Update linphone submodule. 2013-01-28 14:14:08 +01:00
Yann Diorcet
172130803c Update linphone and belle-sip modules 2013-01-25 10:07:40 +01:00
Yann Diorcet
ef3a884311 Replace eXosip/osip by belle-sip
add a checktools utility
Add belle-sip
Add antlr3c
2013-01-23 14:08:55 +01:00
Ghislain MARY
c89b3a8d32 Update linphone submodule. 2013-01-23 12:30:16 +01:00
Ghislain MARY
07a0c183d0 Update ms2 submodule for TCP/TLS keepalive configuration. 2013-01-21 11:29:26 +01:00
Ghislain MARY
2d01d7cf5d Update linphone submodule. 2013-01-18 12:08:54 +01:00
Sylvain Berfini
d98729b8aa Added libneon to detect neon in NDK instead of reading /proc/cpuinfo 2013-01-18 11:50:50 +01:00
Ghislain MARY
28d71039db Update linphone submodule. 2013-01-17 16:56:57 +01:00