linphone-android/jni
Simon Morlat 8a99c4d15c Merge remote-tracking branch 'public/master' into bellesip
Conflicts:
	jni/Application.mk
	submodules/linphone
2013-04-28 16:18:47 +02:00
..
Android.mk Merge remote-tracking branch 'public/master' into bellesip 2013-04-28 16:18:47 +02:00
Application.mk Merge remote-tracking branch 'public/master' into bellesip 2013-04-28 16:18:47 +02:00