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
..
Advanced.strings	Improve ChatRoomView	2012-09-14 16:51:41 +02:00
Audio.strings	Add mic/playback gain settings	2012-11-06 11:05:04 +01:00
Call.strings	Add settings (in/incoming) call timeout	2012-10-29 16:51:43 +01:00
Network.strings	Add edge optimization prefrence	2012-12-03 15:31:39 +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	fix french translations again	2012-10-19 16:40:37 +02:00