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

This commit is contained in:
Yann Diorcet 2012-09-17 12:02:19 +02:00
commit 4a04f72a66
4 changed files with 6 additions and 3 deletions

View file

@ -20,6 +20,8 @@ display_filter_auto_rotate=1
automatically_initiate=0
automatically_accept=0
[net]
firewall_policy=0
[default_values]
reg_expires=600

View file

@ -1,7 +1,6 @@
[net]
download_bw=380
upload_bw=380
firewall_policy=0
mtu=1300
activate_edge_workarounds=1
edge_ping_time=200

View file

@ -1,7 +1,6 @@
[net]
download_bw=512
upload_bw=512
firewall_policy=0
mtu=1300
activate_edge_workarounds=1
edge_ping_time=200

View file

@ -7,4 +7,7 @@ keepalive_period=30000
[rtp]
audio_rtp_port=7076
video_rtp_port=9078
video_rtp_port=9078
[net]
firewall_policy=0