IOS: Merge master

This commit is contained in:
Vincent Bénony 2016-01-06 16:19:03 +01:00
commit 64f50761ec
147 changed files with 3109 additions and 4591 deletions

View file

@ -23,8 +23,8 @@
#ifndef TOOLS_CREATE_PROJECT_H
#define TOOLS_CREATE_PROJECT_H
#ifndef __has_feature // Optional of course.
#define __has_feature(x) 0 // Compatibility with non-clang compilers.
#ifndef __has_feature // Optional of course.
#define __has_feature(x) 0 // Compatibility with non-clang compilers.
#endif
#include <map>