Commit graph

4 commits

Author SHA1 Message Date
Margaux Clerc
913e0b16d5 Merge branch 'master' into dev_phonenumber
Conflicts:
	src/org/linphone/compatibility/ApiElevenPlus.java
	src/org/linphone/compatibility/ApiTwentyThreePlus.java
	src/org/linphone/compatibility/Compatibility.java
2016-08-11 14:05:44 +02:00
Sylvain Berfini
ecf792a7fe Use compatibility method for setTextAppearance 2016-08-11 13:59:12 +02:00
Sylvain Berfini
d19ab25cb2 Updated liblinphone to fix LinphoneFriends without SIP URI database issue 2016-08-09 18:14:18 +02:00
Sylvain Berfini
5cdc58eda5 Use compatibility method for setTextAppearance 2016-08-09 14:40:15 +02:00