Yann Diorcet
|
6d631eb308
|
Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
Classes/ChatRoomViewController.m
Classes/HistoryDetailsViewController.m
Classes/IncomingCallViewController.m
Classes/LinphoneCoreSettingsStore.m
Classes/LinphoneUI/UICallCell.m
Classes/LinphoneUI/UIChatCell.xib
Classes/LinphoneUI/UIChatRoomCell.m
Classes/LinphoneUI/UICompositeViewController.m
Classes/PhoneMainView.h
Classes/PhoneMainView.m
Classes/SettingsViewController.m
Resources/linphonerc-factory~ipad
Settings.bundle/Advanced.plist
Settings/InAppSettings.bundle/en.lproj/Network.strings
Settings/InAppSettings.bundle/fr.lproj/Network.strings
buschjaeger-Info.plist
linphone.ldb/Contents.plist
linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
linphone.xcodeproj/project.pbxproj
|
2012-12-04 11:59:31 +01:00 |
|
Yann Diorcet
|
f63bd03569
|
Disable edge optimization
|
2012-12-03 15:34:37 +01:00 |
|
Yann Diorcet
|
5784808dd9
|
Add edge optimization prefrence
|
2012-12-03 15:31:39 +01:00 |
|
Joerg Platte
|
3fd5f96166
|
disable ping with options
|
2012-11-15 12:52:11 +01:00 |
|
Yann Diorcet
|
9aac229c4a
|
Add mic/playback gain settings
Add upload/download bandwidth settings
|
2012-11-06 11:05:04 +01:00 |
|
Yann Diorcet
|
90c0ed39a7
|
Use tls
|
2012-11-05 09:52:22 +01:00 |
|
Yann Diorcet
|
8811989220
|
Improve settings
|
2012-09-18 12:25:06 +02:00 |
|
Jehan Monnier
|
bacdc8f270
|
Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui
|
2012-09-17 11:23:55 +02:00 |
|
Jehan Monnier
|
f118e62af7
|
move default firewall policy from linphonerc-factory to linphonerc
|
2012-09-17 11:22:16 +02:00 |
|
Simon Morlat
|
40b735ef5a
|
change default values for video policiy.
|
2012-09-16 11:02:17 +02:00 |
|
Jehan Monnier
|
942c0c44e6
|
activate edge mode
|
2012-09-14 17:55:07 +02:00 |
|
Jehan Monnier
|
6d4c6c6ffa
|
add file sharing
|
2012-09-13 17:54:48 +02:00 |
|
Jehan Monnier
|
3c3ad88b84
|
takes default expire from linphonerc
|
2012-09-05 17:33:07 +02:00 |
|
Jehan Monnier
|
911b526564
|
fix a bunch of settings
|
2012-08-30 16:31:08 +02:00 |
|
Simon Morlat
|
2d0a5d42ea
|
organize better config files and fix spelling issue.
|
2012-08-29 13:00:37 +02:00 |
|