mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-24 15:18:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linphone-android/res/raw
History
Margaux Clerc 0da687df64 Merge branch 'master' into dev_in_app_purchase 
Conflicts:
	AndroidManifest.xml
	res/raw/linphonerc_factory
	res/values/non_localizable_custom.xml
	res/xml/preferences.xml
	src/org/linphone/LinphonePreferences.java
	src/org/linphone/SettingsFragment.java
	src/org/linphone/compatibility/ApiFivePlus.java
	src/org/linphone/setup/SetupActivity.java
	src/org/linphone/xmlrpc/XmlRpcHelper.java
	src/org/linphone/xmlrpc/XmlRpcListener.java
	src/org/linphone/xmlrpc/XmlRpcListenerBase.java
2016-06-28 14:56:42 +02:00
..
hold.mkv Fix hold ringtone 2016-03-23 11:59:52 +01:00
incoming_chat.wav Updated linphone 2014-03-06 10:56:14 +01:00
linphonerc_default Fix first read of debug value and enable/disable logs accordingly 2016-05-11 15:48:04 +02:00
linphonerc_factory Merge branch 'master' into dev_in_app_purchase 2016-06-28 14:56:42 +02:00
lpconfig.xsd Added option to disable incall notification 2013-03-20 14:02:32 +01:00
oldphone_mono.wav initial commit 2010-01-18 18:04:25 +01:00
ringback.wav initial commit 2010-01-18 18:04:25 +01:00