diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-10-19 13:30:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 13:30:13 -0700 |
| commit | c955e33497965a90c936a221610bdfb7fad3ca49 (patch) | |
| tree | 803c4727654f51b8e70071f54498903a93ecb724 /.gitignore | |
| parent | 3149e0e88bf09841009851a478dd835fc557aaa1 (diff) | |
| parent | f410177a8b54705bb5efaa7be4ef322153349187 (diff) | |
| download | googletest-c955e33497965a90c936a221610bdfb7fad3ca49.tar.gz googletest-c955e33497965a90c936a221610bdfb7fad3ca49.tar.bz2 googletest-c955e33497965a90c936a221610bdfb7fad3ca49.zip | |
Merge branch 'master' into python3-tests
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 |