Commit graph

1594 commits

Author SHA1 Message Date
Jehan Monnier
0b164fbed2 AdressText cleared display name should be null object 2013-03-01 15:29:02 +01:00
Yann Diorcet
070ce0e44a Update belle-sip submodule 2013-02-28 11:35:36 +01:00
Yann Diorcet
356b99702c Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-28 10:48:01 +01:00
Yann Diorcet
a7d5923892 Update linphone submodule 2013-02-28 10:47:07 +01:00
Yann Diorcet
f759122098 Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 15:11:58 +01:00
Yann Diorcet
278a0e501e Update linphone submodule 2013-02-25 15:11:00 +01:00
Yann Diorcet
d019b687cd Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 15:06:55 +01:00
Yann Diorcet
e2446dff66 Update linphone submodule 2013-02-25 15:05:55 +01:00
Yann Diorcet
eae91f59db Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 15:02:02 +01:00
Yann Diorcet
471dd2f93c Update linphone submodule 2013-02-25 15:01:06 +01:00
Yann Diorcet
de1dd33fa4 Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 11:56:27 +01:00
Yann Diorcet
7d456997db Update linphone submodule 2013-02-25 11:36:56 +01:00
Yann Diorcet
48f170d468 Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 09:29:09 +01:00
Simon Morlat
88374f96c2 update msilbc submodule, for PLC implementation. 2013-02-22 21:31:56 +01:00
Simon Morlat
24a1eceb1e update linphone submodule for new conference recording api. 2013-02-22 21:29:06 +01:00
Yann Diorcet
4ed00cadf4 Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-22 16:50:02 +01:00
Yann Diorcet
e1f88ba5bb Update linphone submodule 2013-02-22 16:48:04 +01:00
Yann Diorcet
2908452282 Update belle-sip and linphone submodules 2013-02-22 16:14:38 +01:00
Yann Diorcet
d45464e743 Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-21 12:19:48 +01:00
Yann Diorcet
9fb3cee127 Add return value for RemoteProvisioning 2013-02-21 11:52:22 +01:00
Simon Morlat
f362658e15 update linphone submodule because of crash 2013-02-20 14:33:37 +01:00
Yann Diorcet
0ecded8ce9 Update linphone and belle-sip submodule 2013-02-20 10:35:44 +01:00
Simon Morlat
9e568722dc echo calibration is now optional (not required for already calibrated models).
change a few default settings.
2013-02-19 17:53:15 +01:00
Sylvain Berfini
43474cc709 Revert manager loading lpconfig.xsd 2013-02-18 17:29:38 +01:00
Sylvain Berfini
e8d91e88b2 Added bluetooth audio route for Android 3.0+ 2013-02-18 17:28:12 +01:00
Yann Diorcet
bfc8d392e2 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
67ddae1025 Remove default.properties file from git 2013-02-13 16:55:51 +01:00
Yann Diorcet
1b98d34e9a Add libupnp dependency for Android 2013-02-13 16:53:50 +01:00
Yann Diorcet
a01216bb93 Merge branch 'bellesip' of git.linphone.org:linphone-android-private into bellesip 2013-02-13 12:00:25 +01:00
Yann Diorcet
d0f4c956f8 Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-13 11:59:52 +01:00
Yann Diorcet
7095af42ac Update linphone submodule 2013-02-13 11:58:33 +01:00
Ghislain MARY
ed928b5ffc Update belle-sip submodule for resolver. 2013-02-12 15:57:27 +01:00
Yann Diorcet
85b8e5cd9f Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-12 14:15:24 +01:00
Yann Diorcet
594c7f2ae2 Update linphone submodule 2013-02-12 14:14:24 +01:00
Yann Diorcet
6ea524bfd7 Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-02-12 13:18:18 +01:00
Yann Diorcet
5810f22516 Sync at the end of remote provisioning 2013-02-12 12:55:23 +01:00
Yann Diorcet
0cd172731b Update belle-sip submodule 2013-02-12 10:55:45 +01:00
Yann Diorcet
7a5f35978f 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
a3acae6085 Update linphone submodule. 2013-02-11 12:12:53 +01:00
Simon Morlat
b47c9cce0a update exosip and linphone 2013-02-08 17:29:41 +01:00
Sylvain Berfini
1ff5f1fd03 Fix double downloading of pictures when chat 2013-02-08 14:57:17 +01:00
Simon Morlat
436dbc45c2 update linphone submodule 2013-02-07 18:47:43 +01:00
Yann Diorcet
2ec4e41cc5 Update linphone submodule 2013-02-07 15:39:23 +01:00
Simon Morlat
a5caa2083f adapt to small api changes 2013-02-07 15:35:39 +01:00
Yann Diorcet
5a6ff7cbdd Update linphone submodule 2013-02-07 15:18:47 +01:00
Yann Diorcet
a4a1636017 Fix makefile in order to avoid recompilation of belle-sip/antlr each times 2013-02-07 11:51:56 +01:00
Yann Diorcet
188fa09cf4 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
72b10a1f32 Add xml2lpc/lpc2xml support and remote provisioning 2013-02-05 10:04:00 +01:00
Sylvain Berfini
68bf4f7c39 Fix account list in status bar when at least one is disabled 2013-01-31 11:53:44 +01:00
Simon Morlat
46fdaa28e2 fix incorrect state name
update linphone submodule
2013-01-30 13:56:35 +01:00