mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-18 03:48:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linphone-android/jni
History
Sylvain Berfini 75934a5400 Merge remote-tracking branch 'master/master' into bellesip 
Conflicts:
	.classpath
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	src/org/linphone/HistoryDetailFragment.java
	submodules/linphone
2013-06-12 10:59:39 +02:00
..
Android.mk Merge remote-tracking branch 'master/master' into bellesip 2013-06-12 10:59:39 +02:00
Application.mk Merge remote-tracking branch 'public/master' into bellesip 2013-04-28 16:18:47 +02:00