linphone-iphone/nogpl-thirdparties/Settings.bundle
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
..
en.lproj fix no gpl third parties target 2011-12-02 12:07:37 +01:00
Advanced.plist add setting for stun server 2012-03-20 14:14:00 +01:00
audio.plist fix no gpl third parties target 2011-12-02 12:07:37 +01:00
Root.plist Merge remote-tracking branch 'public/master' into tunnel 2012-02-06 13:22:39 +01:00
Tunnel.plist Correct typo in tunnel settings, update exosip 2012-02-07 10:10:01 +01:00
video.plist no_gpl: add Automatically start video setting 2012-01-13 11:38:44 +01:00