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
..
externals	media encryption API enhancements	2011-11-23 22:20:00 +01:00
libilbc-rfc3951@af32518af4	Report bug button in about activity when debug on.	2011-09-30 08:56:06 +02:00
linphone@72a5086327	media encryption API enhancements	2011-11-23 22:20:00 +01:00
msamr@93274c2b87	update msamr	2011-04-16 00:31:41 +02:00
msilbc@7320dbb529	add sttatus bar + new icons	2010-05-17 17:14:08 +02:00
mssilk@98fb31155c	Fix prepare_source.	2011-11-07 12:45:02 +01:00
msx264@b78cec7a59	Update linphone and msx264	2011-10-13 12:10:06 +02:00