linphone-android/jni
Yann Diorcet e24ec45fc6 Merge remote-tracking branch 'origin' into bellesip
Conflicts:
	Makefile
	submodules/linphone
2013-03-08 16:02:07 +01:00
..
Android.mk update belle-sip,linphone 2013-03-04 19:03:22 +01:00
Application.mk Merge remote-tracking branch 'origin' into bellesip 2013-03-08 16:02:07 +01:00