linphone-iphone/Settings/InAppSettings.bundle/fr.lproj
Simon Morlat 3376388982 Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk
2014-04-14 12:52:00 +02:00
..
Advanced.strings Better translation for Primary Account 2014-02-26 12:02:44 +01:00
Audio.strings Add audio codec bitrate limit setting. 2013-06-28 15:09:32 +02:00
Call.strings Add settings (in/incoming) call timeout 2012-10-29 16:51:43 +01:00
Network.strings Add "enable ipv6" setting in Network 2014-02-26 12:02:44 +01:00
Root.strings Add settings (in/incoming) call timeout 2012-10-29 16:51:43 +01:00
Tunnel.strings Merge branch 'master' into tunnel 2013-01-15 12:58:42 +01:00
Video.strings Add HD video configuration in the settings. 2013-07-22 13:25:27 +02:00