Jehan Monnier 1f687ef981 Merge remote-tracking branch 'bc/master' into tunnel ... Conflicts: linphone.xcodeproj/project.pbxproj submodules/build/Makefile		2011-06-17 10:13:20 +02:00
..
en.lproj	initial commit with basic ui	2010-01-22 11:44:23 +01:00
Root.plist	Merge remote-tracking branch 'bc/master' into tunnel	2011-06-17 10:13:20 +02:00