mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-04-21 20:48:29 +00:00
Code Issues Projects Releases Packages Wiki Activity
3045 commits 43 branches 186 tags 122 MiB
Commit graph

7 commits

Author SHA1 Message Date
Margaux Clerc
dadf690155 Update Linphone Main with side menu/ Dialer 2015-09-18 18:08:44 +02:00
Margaux Clerc
b42b45e34e fix password in assistant and remove useless code 2015-09-18 15:42:55 +02:00
Margaux Clerc
9c7017ce29 Rename/clear assistant 2015-09-15 17:38:42 +02:00
Margaux Clerc
6614704d21 Merge remote-tracking branch 'linphone/master' into 3.0.X 
Conflicts:
	AndroidManifest.xml
	res/layout/chat_bubble_alt_incoming.xml
	res/layout/chat_bubble_alt_outgoing.xml
	res/layout/chat_bubble_incoming.xml
	res/layout/chat_bubble_outgoing.xml
	res/values/strings.xml
	src/org/linphone/ContactsManager.java
	src/org/linphone/compatibility/ApiFivePlus.java
	src/org/linphone/ui/BubbleChat.java
 2015-09-10 18:58:01 +02:00
Margaux Clerc
0c16efdec5 Update assistant 2015-09-01 11:18:37 +02:00
Margaux Clerc
d285837af9 Rework assistant 2015-08-17 15:04:59 +02:00
Margaux Clerc
b9ba2d0714 Rename and delete 2015-08-17 15:01:41 +02:00