Simon Morlat
|
9af95dc58e
|
Merge remote-tracking branch 'origin/master' into tunnel
Conflicts:
Classes/LinphoneUI/LinphoneManager.m
linphone.xcodeproj/project.pbxproj
submodules/build/Makefile
submodules/externals/exosip
submodules/liblinphone.xcodeproj/project.pbxproj
submodules/linphone
submodules/mssilk
|
2012-04-26 15:09:04 +02:00 |
|
Simon Morlat
|
2956c3d478
|
add setting for stun server
|
2012-03-20 14:14:00 +01:00 |
|
Pierre-Eric Pelloux-Prayer
|
b28cc704cd
|
Correct typo in tunnel settings, update exosip
|
2012-02-07 10:10:01 +01:00 |
|
Pierre-Eric Pelloux-Prayer
|
17cc55d854
|
Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
Classes/LinphoneUI/LinphoneManager.h
Settings.bundle/Root.plist
linphone.xcodeproj/project.pbxproj
nogpl-thirdparties/Settings.bundle/Root.plist
submodules/build/builder-iphone-os.mk
submodules/linphone
|
2012-02-06 13:22:39 +01:00 |
|
Pierre-Eric Pelloux-Prayer
|
fef733581b
|
no_gpl: add Automatically start video setting
|
2012-01-13 11:38:44 +01:00 |
|
Pierre-Eric Pelloux-Prayer
|
4aef1e400b
|
Moved Advanced settings to a new child panel
Also added a note indicating to the user the necessity of restarting Linphone
for SIP account to take effect
Fixes issue: 107, 80
|
2012-01-13 11:38:43 +01:00 |
|
Simon Morlat
|
bc75544285
|
tunnel mode is working good.
|
2011-12-12 23:05:08 +01:00 |
|
Jehan Monnier
|
9d77b1bd28
|
fix no gpl third parties target
|
2011-12-02 12:07:37 +01:00 |
|