Pierre-Eric Pelloux-Prayer 46df47c465 Merge remote-tracking branch 'public/wip_video_ui_improvements' into buschjaeger ... Conflicts: linphone.xcodeproj/project.pbxproj linphonerc linphonerc-ipad		2012-04-24 15:10:37 +02:00
..
en.lproj	initial commit with basic ui	2010-01-22 11:44:23 +01:00
Advanced.plist	Add a 'do not auto start application' setting	2012-03-27 11:28:36 +02:00
audio.plist	enable pcma by default	2011-12-06 16:28:09 +01:00
Root.plist	update linphone submodule, add stun setting, change icon	2012-03-20 17:31:08 +01:00
video.plist	add *addvideo* button	2011-11-21 18:17:36 +01:00