Yann Diorcet 233f22e5d7 Merge branch 'master' into tunnel ... Conflicts: Classes/LinphoneUI/LinphoneManager.h Classes/LinphoneUI/LinphoneManager.m Settings.bundle/Root.plist Settings/InAppSettings.bundle/Root.plist linphone.xcodeproj/project.pbxproj submodules/build/builders.d/x264.mk		2013-01-15 12:58:42 +01:00
..
.gitignore	Add files to .gitignore	2012-09-11 17:58:57 +02:00
project.pbxproj	Merge branch 'master' into tunnel	2013-01-15 12:58:42 +01:00