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
..
en.lproj	Merge remote-tracking branch 'public/master' into tunnel	2014-04-14 12:52:00 +02:00
fr.lproj	Merge remote-tracking branch 'public/master' into tunnel	2014-04-14 12:52:00 +02: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	Replace 32kb/s bandwidth setting by something a bit less aggressive: 36kb/s	2013-11-04 15:24:57 +01:00
Call.plist	Add settings (in/incoming) call timeout	2012-10-29 16:51:43 +01:00
Network.plist	Progress commit: switching to multitransport	2014-03-25 09:03:56 +01:00
Root.plist	Merge remote-tracking branch 'public/master' into tunnel	2014-04-14 12:52:00 +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