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
..
en.lproj	Add French translation	2012-09-11 13:35:02 +02:00
fr.lproj	Add French translation	2012-09-11 13:35:02 +02:00
Advanced.plist	add file sharing	2012-09-13 17:54:48 +02:00
Audio.plist	Merge branch 'inappsettings' into new_ui	2012-06-22 18:30:18 +02:00
Call.plist	fix a bunch of settings	2012-08-30 16:31:08 +02:00
Network.plist	Add default setting files	2012-08-23 11:21:22 +02:00
Root.plist	Better UIViewController handling in UICompositeViewController	2012-08-10 01:21:30 +02:00
Video.plist	Add French translation	2012-09-11 13:35:02 +02:00