Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Pierre Goiffon
2019-05-23 10:52:34 +02:00
52 changed files with 7980 additions and 1377 deletions

3
.gitignore vendored
View File

@@ -38,7 +38,8 @@ test/vendor/*
!/.idea/inspectionProfiles
!/.idea/inspectionProfiles/*
#phpdocumentor temp file
ast.dump
# CMake
cmake-build-*/