linphone-android/res/values
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
..
attrs.xml Added shadows to contact pictures 2012-07-23 17:51:35 +02:00
color.xml Update History 2015-09-04 12:04:06 +02:00
custom.xml Merge remote-tracking branch 'linphone/master' into 3.0.X 2015-09-10 18:58:01 +02:00
digit_style.xml Rework numpad 2015-09-01 15:09:13 +02:00
non_localizable_custom.xml Merge remote-tracking branch 'linphone/master' into 3.0.X 2015-09-10 18:58:01 +02:00
non_localizable_strings.xml Add preferences to choose the video preset and the preferred video FPS + update linphone submodule. 2015-06-11 15:23:09 +02:00
slidingtab_style.xml Fundamental incall UI changes. 2011-11-22 11:21:36 +01:00
strings.xml Merge remote-tracking branch 'linphone/master' into 3.0.X 2015-09-10 18:58:01 +02:00
styles.xml Merge remote-tracking branch 'linphone/master' into 3.0.X 2015-09-10 18:58:01 +02:00