Margaux Clerc
|
0da687df64
|
Merge branch 'master' into dev_in_app_purchase
Conflicts:
AndroidManifest.xml
res/raw/linphonerc_factory
res/values/non_localizable_custom.xml
res/xml/preferences.xml
src/org/linphone/LinphonePreferences.java
src/org/linphone/SettingsFragment.java
src/org/linphone/compatibility/ApiFivePlus.java
src/org/linphone/setup/SetupActivity.java
src/org/linphone/xmlrpc/XmlRpcHelper.java
src/org/linphone/xmlrpc/XmlRpcListener.java
src/org/linphone/xmlrpc/XmlRpcListenerBase.java
|
2016-06-28 14:56:42 +02:00 |
|
Sylvain Berfini
|
82fe152b5c
|
Replaced e.printStackTrace by Log.e(e)
|
2016-05-11 16:49:29 +02:00 |
|
Margaux Clerc
|
a106c51f0d
|
Fix assistant and test
|
2015-11-13 11:07:06 +01:00 |
|
Margaux Clerc
|
104668cd4d
|
Add fetch remote provisioning with xmlrpc
|
2015-11-03 18:43:04 +01:00 |
|
Margaux Clerc
|
d69d7e72fc
|
fix password in assistant and remove useless code
|
2015-09-18 15:42:55 +02:00 |
|
Margaux Clerc
|
6b6a39fddf
|
Rename/clear assistant
|
2015-09-15 17:38:42 +02:00 |
|
Margaux Clerc
|
90d9193aa7
|
Rework assistant
|
2015-08-17 15:04:59 +02:00 |
|
Margaux Clerc
|
6780613338
|
Rename and delete
|
2015-08-17 15:01:41 +02:00 |
|