Commit graph

2 commits

Author SHA1 Message Date
Jehan Monnier
faa1df7edb Merge remote-tracking branch 'origin/new_ui' into new_ui
Conflicts:
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/LinphoneManager.m
	linphone.ldb/Resources/Classes/ChatRoomViewController/10/ChatRoomViewController.xib
	linphone.xcodeproj/project.pbxproj
2012-09-14 09:17:17 +02:00
Yann Diorcet
e232007bb9 Start localization 2012-09-11 13:33:09 +02:00