Margaux Clerc
|
410f168acf
|
Merge remote-tracking branch 'private/3.0.X' into obiane
Conflicts:
AndroidManifest.xml
res/drawable/status_level.xml
res/layout/call.xml
res/layout/chat.xml
res/layout/chat_bubble_outgoing.xml
res/layout/contact_control_row.xml
res/layout/search_contact_cell.xml
res/values/strings.xml
src/org/linphone/CallActivity.java
src/org/linphone/ChatFragment.java
src/org/linphone/ContactDetailsFragment.java
src/org/linphone/LinphoneService.java
|
2015-11-16 09:06:12 +01:00 |
|
Margaux Clerc
|
a106c51f0d
|
Fix assistant and test
|
2015-11-13 11:07:06 +01:00 |
|
Margaux Clerc
|
d279336e33
|
fix small issues
|
2015-11-10 17:53:12 +01:00 |
|
Margaux Clerc
|
ffb1eccb24
|
Interface update
|
2015-11-05 16:23:59 +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 |
|