mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linphone-iphone/linphone.xcodeproj
History
Yann Diorcet 3dc20d1aed Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneUI/UIStateBar.h
	Classes/LinphoneUI/UIStateBar.m
	Classes/LinphoneUI/UIStateBar.xib
	Classes/SettingsViewController.m
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	buschjaeger-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
2013-01-16 15:56:32 +01:00
..
.gitignore Add files to .gitignore 2012-09-11 17:58:57 +02:00
project.pbxproj Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2013-01-16 15:56:32 +01:00