Simon Morlat edd0d46291 Merge remote-tracking branch 'public/master' into tunnel ... Conflicts: Classes/LinphoneCoreSettingsStore.m		2014-04-22 17:03:25 +02:00
..
.gitignore	Add files to .gitignore	2012-09-11 17:58:57 +02:00
project.pbxproj	Merge remote-tracking branch 'public/master' into tunnel	2014-04-22 17:03:25 +02:00