mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-21 05:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2993 commits 36 branches 184 tags 129 MiB
Commit graph

3 commits

Author SHA1 Message Date
Margaux Clerc
c3dc710337 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
af3a159f8d Add new items for chat 2015-09-01 15:12:45 +02:00
Sylvain Berfini
af7048f125 Revert to using a chat fragment, but load it in a separated activity on phones to still have the rotation feature 2015-03-13 14:23:03 +01:00