Merge branch 'master' into develop

This commit is contained in:
Frank
2021-04-23 13:29:37 +02:00
7 changed files with 51 additions and 44 deletions

2
.gitignore vendored
View File

@@ -18,6 +18,8 @@ local.properties
# External tool builders
.externalToolBuilders/
# AppVeyor
.appveyor/
# CDT-specific
.cproject