Commit graph

448 commits

Author SHA1 Message Date
Jehan Monnier
4e3a70217b Merge remote-tracking branch 'public/master' into bellesip
Conflicts:
	jni/libneon/libneon_jni.cc
	src/org/linphone/LinphoneManager.java
	submodules/linphone
2013-03-26 17:12:21 +01:00
Jehan Monnier
d278f26590 implement keep alive handler every 10mn 2013-03-26 15:59:09 +01:00
Jehan Monnier
a30ec58bf8 fix upnp build issue 2013-03-26 11:10:14 +01:00
Sylvain Berfini
6292bd263c Updated liblinphone (build fix) 2013-03-25 16:42:36 +01:00
Jehan Monnier
0722db89de update submodule linphone 2013-03-22 17:29:43 +01:00
Sylvain Berfini
b8efe25a78 Merge remote-tracking branch 'master/master' into bellesip
Conflicts:
	.gitmodules
	src/org/linphone/AccountPreferencesFragment.java
	submodules/linphone
2013-03-22 12:08:46 +01:00
Jehan Monnier
32823b4b5a update bellesip/linphone +disable upnp for rtp 2013-03-19 11:28:10 +01:00
Guillaume Beraudo
9e3f8df44d Use submodule for aXMLRPC. 2013-03-18 12:38:41 +01:00
Jehan Monnier
a2a498e0b2 update msé/belle-sip 2013-03-18 09:18:24 +01:00
Simon Morlat
2af92fc1a6 update linphone submodule (for user tones) 2013-03-14 18:06:04 +01:00
Jehan Monnier
ca764f920a fix test suite 2013-03-13 13:42:36 +01:00
Yann Diorcet
20f25a73b1 Add JUnit tests in liblinphone_tester 2013-03-12 15:31:09 +01:00
Simon Morlat
a36886ff90 update linphone submodule for new LinphoneAuthInfo methods. 2013-03-11 17:15:49 +01:00
Yann Diorcet
eefd0c6100 Update cunit submodule 2013-03-11 16:42:04 +01:00
Simon Morlat
26aac853d1 update linphone submodule in order to fix build. 2013-03-11 12:03:42 +01:00
Jehan Monnier
72cc072aaf update belle-=sip and linphone 2013-03-11 10:27:54 +01:00
Yann Diorcet
260e078c6e Add suites and tests in liblinphone_tester 2013-03-08 16:09:35 +01:00
Yann Diorcet
9be8020d4f Merge remote-tracking branch 'origin' into bellesip
Conflicts:
	Makefile
	submodules/linphone
2013-03-08 16:02:07 +01:00
Yann Diorcet
7635d454ac Update linphone submodule 2013-03-08 15:57:20 +01:00
Jehan Monnier
a1fc6b6fbe update linphone, fix android build scripts 2013-03-07 22:21:43 +01:00
Simon Morlat
078fd1fc2b update linphone submodule 2013-03-07 17:41:39 +01:00
Yann Diorcet
894581b6d2 Add liblinphone tester project 2013-03-07 17:35:05 +01:00
Jehan Monnier
401e3d2c2e add userid +upnp settings 2013-03-05 16:36:49 +01:00
Jehan Monnier
3ece105d03 update belle-sip,linphone 2013-03-04 19:03:22 +01:00
Jehan Monnier
3b34477d4d add new target generate-sdk 2013-03-04 15:24:16 +01:00
Ghislain MARY
cfca2870b6 Update linphone submodule. 2013-03-04 14:37:23 +01:00
Jehan Monnier
0b164fbed2 AdressText cleared display name should be null object 2013-03-01 15:29:02 +01:00
Yann Diorcet
c0eb376058 Update linphone submodule 2013-02-28 13:20:28 +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
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
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