Simon Morlat b838ecebd3 Merge branch 'master' into tunnel ... and fix srtp compilation (arch not set in archives). Conflicts: Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj		2011-10-26 23:01:19 +02:00
..
en.lproj	initial commit with basic ui	2010-01-22 11:44:23 +01:00
Root.plist	Merge branch 'master' into tunnel	2011-10-26 23:01:19 +02:00