linphone-android/jni
Yann Diorcet 0408e3eae8 Merge branch 'master' into bellesip
Conflicts:
	.gitmodules
	Makefile
	submodules/externals/build/exosip/Android.mk
	submodules/externals/exosip
	submodules/linphone
2013-02-06 12:22:28 +01:00
..
libneon Added libneon to detect neon in NDK instead of reading /proc/cpuinfo 2013-01-18 11:50:50 +01:00
Android.mk Merge branch 'master' into bellesip 2013-02-06 12:22:28 +01:00
Application.mk Merge branch 'master' into bellesip 2013-02-06 12:22:28 +01:00