Merge branch 'master' into cmake-if-syntax

This commit is contained in:
Gennadiy Civil 2018-10-10 15:29:17 -04:00 committed by GitHub
commit 4c92120d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

2
.gitignore vendored
View File

@ -41,6 +41,8 @@ googletest/fused-src/
# macOS files
.DS_Store
googletest/.DS_Store
googletest/xcode/.DS_Store
# Ignore cmake generated directories and files.
CMakeFiles