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
..
InAppSettings.bundle	Merge remote-tracking branch 'origin/new_ui' into new_ui	2012-09-14 09:17:17 +02:00