linphone-iphone/Settings
Yann Diorcet 6113992183 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/AboutViewController.xib
	Classes/PhoneMainView.m
	Resources/licenses.html
	linphone.ldb/Contents.plist
	linphone.xcodeproj/project.pbxproj
2013-01-28 15:16:39 +01:00
..
InAppSettings.bundle/ru.lproj Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2013-01-28 15:16:39 +01:00