linphone-ios/Settings/InAppSettings.bundle/en.lproj/Tunnel.strings at f17e8259e16fd77458774d8d2ff807fc7064df6f - witine/linphone-ios - Witine

witine/linphone-ios

forked from mirrors/linphone-iphone

Yann Diorcet 233f22e5d7 Merge branch 'master' into tunnel

Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	Settings.bundle/Root.plist
	Settings/InAppSettings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builders.d/x264.mk

2013-01-15 12:58:42 +01:00

20 lines

No EOL

201 B

Text

Raw Blame History

 /* Auto */
 "Auto" = "Auto";
 /* Address */
 "Address" = "Address";
 /* Mode */
 "Mode" = "Mode";
 /* Off */
 "Off" = "Off";
 /* On */
 "On" = "On";
 /* Port */
 "Port" = "Port";
 /* WWAN */
 "WWAN" = "WWAN";