linphone-iphone/linphone.xcodeproj
Gautier Pelloux-Prayer 3b8ddd28a1 Merge branch 'dev_inapp_purchase'
Conflicts:
	.tx/config
	Classes/Base.lproj/WizardViews.xib
	Classes/Utils/Utils.h
	Classes/Utils/Utils.m
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Resources/linphonerc-factory
	Resources/linphonerc-factory~ipad
2015-04-30 17:01:51 +02:00
..
xcshareddata/xcschemes xcode: update scheme as suggested by xcode 2015-04-15 12:56:22 +02:00
.gitignore Add files to .gitignore 2012-09-11 17:58:57 +02:00
project.pbxproj Merge branch 'dev_inapp_purchase' 2015-04-30 17:01:51 +02:00