witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
856 commits 24 branches 110 tags 140 MiB
Commit graph

2 commits

Author SHA1 Message Date
Yann Diorcet
a8d884a149 Fix audio settings 2012-10-01 13:49:11 +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