linphone-android/res
Guillaume Beraudo 25f6a5445c Merge branch 'master' of git.linphone.org:linphone-android
Conflicts:
	src/org/linphone/IncallActivity.java
	src/org/linphone/LinphoneActivity.java
	src/org/linphone/LinphonePreferencesActivity.java
	submodules/linphone
	test/org/linphone/TestConferenceActivity.java
2011-11-24 11:22:07 +01:00
..
drawable Fundamental ios-like ui change for incall view. 2011-11-24 10:55:08 +01:00
drawable-hdpi Use Android SlidingTab for incoming call activity. 2011-10-11 11:38:53 +02:00
drawable-ldpi Initial support for contact picture retrieving 2011-10-03 16:33:59 +02:00
drawable-mdpi Initial support for contact picture retrieving 2011-10-03 16:33:59 +02:00
layout Fundamental ios-like ui change for incall view. 2011-11-24 10:55:08 +01:00
layout-land Cleaning + fix video activity opening. 2011-11-09 13:18:11 +01:00
menu Captured video always sent in correct orientation. 2011-01-03 14:14:22 +01:00
raw Wait for service in main Activity; removed elsewhere 2011-11-15 11:12:42 +01:00
values Merge branch 'master' of git.linphone.org:linphone-android 2011-11-24 11:22:07 +01:00
xml media encryption API enhancements 2011-11-23 22:20:00 +01:00