Commit graph

7 commits

Author SHA1 Message Date
Yann Diorcet
c0c4c7f6c8 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui
Conflicts:
	Classes/LinphoneApp.xib
	Classes/PhoneMainView.xib
2012-07-18 09:05:37 +02:00
Yann Diorcet
6056c0504c Fullscreen application 2012-07-17 20:21:29 +02:00
Yann Diorcet
e352543273 Improve history and chat 2012-07-17 17:30:58 +02:00
Yann Diorcet
c62dabc1bc Fix first login view
Working Incoming call view
Fix some value with inappsettings
2012-06-26 18:32:39 +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
Yann Diorcet
075c6f6a0a Continue workoing on new ui
Use event for registration update
2012-06-13 13:49:20 +02:00
Yann Diorcet
f01c973e11 Continue working on new ui 2012-06-11 17:31:00 +02:00