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
..
en.lproj	Merge branch 'master' into tunnel	2013-01-15 12:58:42 +01:00
fr.lproj	Merge branch 'master' into tunnel	2013-01-15 12:58:42 +01:00
Advanced.plist	Fix sharing server auto-correction	2012-10-31 11:36:19 +01:00
Audio.plist	Working mic/playback gain settings	2012-11-06 15:20:38 +01: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	Fix iPad dialer preview	2012-09-17 17:44:58 +02:00