Guillaume Beraudo e436b2b620 Merge branch 'master' of git.linphone.org:linphone-android into conferencing ... Conflicts: src/org/linphone/LinphoneManager.java src/org/linphone/core/LinphoneCallParamsImpl.java src/org/linphone/core/LinphoneCoreImpl.java submodules/linphone		2011-10-13 15:57:22 +02:00
..
drawable	Enhanced uri picker activity (image buttons)	2011-10-11 14:28:42 +02: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	Uri picker dialer don't play dtmf but concatenate to address.	2011-10-12 16:01:38 +02:00
layout-land	improved incoming activity + back to conference button.	2011-09-30 15:59:00 +02:00
menu	Captured video always sent in correct orientation.	2011-01-03 14:14:22 +01:00
raw	Enable srtp	2011-10-07 08:51:50 +02:00
values	Uri picker dialer don't play dtmf but concatenate to address.	2011-10-12 16:01:38 +02:00
xml	Initial support for conferencing.	2011-09-30 15:59:00 +02:00