Commit graph

3 commits

Author SHA1 Message Date
Sylvain Berfini
47e7bc2293 Still improving resources 2018-10-25 11:09:58 +02:00
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
Sylvain Berfini
bad47c6ddd Added call options to incall audio view 2012-07-17 11:21:03 +02:00