Merge branch 'master' of git.linphone.org:linphone-android

This commit is contained in:
Jehan Monnier 2013-09-16 11:55:36 +02:00
commit 7b0985a305

View file

@ -31,6 +31,9 @@ disable_upnp=1
playback_dev_id=
ringer_dev_id=
capture_dev_id=
#playback_dev_id=ANDROID SND (deprecated): Android Sound card
#ringer_dev_id=ANDROID SND (deprecated): Android Sound card
#capture_dev_id=ANDROID SND (deprecated): Android Sound card
remote_ring=/data/data/org.linphone/files/ringback.wav
local_ring=/data/data/org.linphone/files/oldphone_mono.wav
dtmf_player_amp=0.1