Commit graph

5 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
Simon Morlat
4a0e4e1ee8 inapp settings mostly finished. 2012-06-12 17:48:43 +02:00
Simon Morlat
2e3d4c0fdf many bugfixes, work in progress 2012-06-12 00:38:34 +02:00
Simon Morlat
c058c5cbde work in progress for in app settings 2012-06-07 22:21:33 +02:00
Pierre-Eric Pelloux-Prayer
d42c91f802 In app settings WIP 2012-05-24 13:12:00 +02:00