Commit graph

4 commits

Author SHA1 Message Date
Simon Morlat
c5e876d87e improve texts 2012-10-19 17:51:12 +02:00
Yann Diorcet
d850800fcd Add push notification setting
add default settings for wizard
2012-09-18 12:14:49 +02:00
Yann Diorcet
179fc7ab18 Add French translation 2012-09-11 13:35:02 +02:00
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