Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui

This commit is contained in:
Yann Diorcet 2012-08-21 14:54:17 +02:00
commit 0552ba5e58
3 changed files with 3 additions and 1 deletions

View file

@ -29,6 +29,7 @@ playback_dev_id=AU: Audio Unit Receiver
ringer_dev_id=AQ: Audio Queue Device
capture_dev_id=AU: Audio Unit Receiver
echocancellation=0
dtmf_player_amp=0.007
[misc]
history_max_size=30

View file

@ -29,6 +29,7 @@ playback_dev_id=AU: Audio Unit Receiver
ringer_dev_id=AQ: Audio Queue Device
capture_dev_id=AU: Audio Unit Receiver
echocancellation=0
dtmf_player_amp=0.007
[misc]
history_max_size=30

@ -1 +1 @@
Subproject commit 0a12fa9ce7af5c795722ce1f7ebad9bc85314d3b
Subproject commit 75040297c12e118cea0ec87d2bc3980c290f8e86