linphone-iphone/linphone.ldb
Guillaume BIENKOWSKI 8216215669 Merge branch 'master' into HEAD to incorporate changes for version 2.1 (see tag 2.1)
Conflicts:
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/linphonerc-factory
	linphone-Info.plist
2013-10-11 16:32:53 +02:00
..
Resources Merge branch 'master' into HEAD to incorporate changes for version 2.1 (see tag 2.1) 2013-10-11 16:32:53 +02:00
Contents.plist Fix display of video preview with 720p capture. 2013-07-22 13:26:22 +02:00