linphone-android/libs
Guillaume Beraudo 6619599beb Merge branch 'video' of git.linphone.org:linphone-android-private
Conflicts:
	libs/armeabi-v7a/liblinphone.so
	libs/armeabi/liblinphone.so
	src/org/linphone/core/LinphoneCallImpl.java
	src/org/linphone/core/LinphoneProxyConfigImpl.java
	src/org/linphone/core/tutorials/TutorialRegistrationActivity.java
	submodules/linphone
2010-12-14 09:32:47 +01:00
..
armeabi Merge branch 'video' of git.linphone.org:linphone-android-private 2010-12-14 09:32:47 +01:00
armeabi-v7a Merge branch 'video' of git.linphone.org:linphone-android-private 2010-12-14 09:32:47 +01:00