linphone-iphone/Settings/InAppSettings.bundle
Guillaume BIENKOWSKI 1ec60999ab Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
	Classes/LinphoneManager.h
	Classes/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk

+ Made modifications to the tunnel compilation so that it builds without openssl.
2013-11-05 10:54:23 +01:00
..
en.lproj Merge remote-tracking branch 'public/master' into tunnel 2013-11-05 10:54:23 +01:00
fr.lproj Merge remote-tracking branch 'public/master' into tunnel 2013-11-05 10:54:23 +01:00
ru.lproj Add HD video configuration in the settings. 2013-07-22 13:25:27 +02:00
Advanced.plist Fix sharing server auto-correction 2012-10-31 11:36:19 +01:00
Audio.plist Add audio codec bitrate limit setting. 2013-06-28 15:09:32 +02:00
Call.plist Add settings (in/incoming) call timeout 2012-10-29 16:51:43 +01:00
Network.plist Add edge optimization prefrence 2012-12-03 15:31:39 +01:00
Root.plist Merge branch 'master' into tunnel 2013-01-15 12:58:42 +01:00
Tunnel.plist Merge branch 'master' into tunnel 2013-01-15 12:58:42 +01:00
Video.plist Add HD video configuration in the settings. 2013-07-22 13:25:27 +02:00