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
..
ApiEightPlus.java	Removed warnings in java code	2015-03-11 10:44:59 +01:00
ApiElevenPlus.java	Rework views history/contacts/chat with the new design	2015-07-30 15:46:28 +02:00
ApiFivePlus.java	Merge remote-tracking branch 'linphone/master' into 3.0.X	2015-09-10 18:58:01 +02:00
ApiFourteenPlus.java	More improvements on Bluetooth manager	2014-03-27 11:30:06 +01:00
ApiNinePlus.java	Add linphone friend management	2015-04-13 19:07:01 +02:00
ApiSixteenPlus.java	Merge remote-tracking branch 'linphone/master' into 3.0.X	2015-09-10 18:58:01 +02:00
ApiTwentyOnePlus.java	Merge remote-tracking branch 'linphone/master' into 3.0.X	2015-09-10 18:58:01 +02:00
Compatibility.java	Ability to set notification priority (API>16), also when used as a Library	2015-07-02 01:32:09 +02:00
CompatibilityScaleGestureDetector.java	Fix some issues including video memory leak	2012-08-03 17:48:54 +02:00
CompatibilityScaleGestureListener.java	Fix some issues including video memory leak	2012-08-03 17:48:54 +02:00