witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/linphone.xcodeproj
History
Guillaume BIENKOWSKI 08d486afa5 Merge branch 'master' into remote 
Conflicts:
	Classes/Base.lproj/WizardViews.xib
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Classes/WizardViewController.h
	Classes/WizardViewController.m
2014-04-02 15:11:08 +02:00
..
.gitignore Add files to .gitignore 2012-09-11 17:58:57 +02:00
project.pbxproj Merge branch 'master' into remote 2014-04-02 15:11:08 +02:00