Margaux Clerc 410f168acf Merge remote-tracking branch 'private/3.0.X' into obiane ... Conflicts: AndroidManifest.xml res/drawable/status_level.xml res/layout/call.xml res/layout/chat.xml res/layout/chat_bubble_outgoing.xml res/layout/contact_control_row.xml res/layout/search_contact_cell.xml res/values/strings.xml src/org/linphone/CallActivity.java src/org/linphone/ChatFragment.java src/org/linphone/ContactDetailsFragment.java src/org/linphone/LinphoneService.java		2015-11-16 09:06:12 +01:00
..
attrs.xml	Remove old assets and colors	2015-10-15 10:59:47 +02:00
color.xml	Interface update	2015-11-05 16:23:59 +01:00
custom.xml	Interface update	2015-11-05 16:23:59 +01:00
digit_style.xml	Interface update	2015-11-05 16:23:59 +01:00
non_localizable_custom.xml	Interface update	2015-11-05 16:23:59 +01: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 'private/3.0.X' into obiane	2015-11-16 09:06:12 +01:00
styles.xml	Interface update	2015-11-05 16:23:59 +01:00