Guillaume Beraudo 7cb1c96304 Merge branch 'master' of git.linphone.org:linphone-android ... Conflicts: src/org/linphone/core/Version.java Add neon check on first launch		2011-04-19 11:48:28 +02:00
..
linphone	Merge branch 'master' of git.linphone.org:linphone-android	2011-04-19 11:48:28 +02:00
mediastreamer2/test	Move ring test from mediastreamer2.	2011-04-07 10:54:57 +02:00