linphone-iphone/Settings/InAppSettings.bundle
Gautier Pelloux-Prayer 3b8ddd28a1 Merge branch 'dev_inapp_purchase'
Conflicts:
	.tx/config
	Classes/Base.lproj/WizardViews.xib
	Classes/Utils/Utils.h
	Classes/Utils/Utils.m
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Resources/linphonerc-factory
	Resources/linphonerc-factory~ipad
2015-04-30 17:01:51 +02:00
..
ar.lproj i10n: update translations 2015-04-27 09:57:11 +02:00
de.lproj i10n: update translations 2015-04-27 09:57:11 +02:00
en.lproj i10n: update translations 2015-04-27 09:57:11 +02:00
fr.lproj i10n: update translations 2015-04-27 09:57:11 +02:00
ja.lproj i10n: update translations 2015-04-27 09:57:11 +02:00
nl.lproj i10n: update translations 2015-04-27 09:57:11 +02:00
ru.lproj i10n: update translations 2015-04-27 09:57:11 +02:00
zh_TW.lproj i10n: update translations 2015-04-27 09:57:11 +02:00
Advanced.plist i10n: add Settings page to translatable resources 2015-04-20 14:39:55 +02:00
Audio.plist Add support for more AAC-ELD frequencies 2014-10-27 12:22:41 +01:00
Call.plist Add voice mail feature: long press on "1" button will call it, if configured 2014-09-24 14:21:03 +02:00
Network.plist enable SRTP DTLS 2015-02-20 18:28:47 +01:00
Root.plist Merge branch 'dev_inapp_purchase' 2015-04-30 17:01:51 +02: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