Commit graph

52 commits

Author SHA1 Message Date
Yann Diorcet
44e438ab33 Merge branch 'inappsettings' into new_ui
Conflicts:
	Classes/FirstLoginViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneAppDelegate.h
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	Classes/MainScreenWithVideoPreview.m
	Classes/PhoneViewController.m
	PhoneMainView.xib
	linphone.xcodeproj/project.pbxproj
2012-06-22 18:30:18 +02:00
Yann Diorcet
bfa794d357 Add Chat and Settings views 2012-06-22 10:40:52 +02:00