linphone-android/submodules/externals/build/libxml2
Simon Morlat 15ed1fed59 Merge remote-tracking branch 'public/master' into bellesip
Conflicts:
	jni/Application.mk
	submodules/linphone
2013-04-28 16:18:47 +02:00
..
libxml
Android.mk Merge remote-tracking branch 'public/master' into bellesip 2013-04-28 16:18:47 +02:00
config.h