Merge branch 'master' into cmake-if-syntax
This commit is contained in:
commit
4c92120d6d
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user