summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-10-10 19:28:58 (GMT)
committerGitHub <noreply@github.com>2018-10-10 19:28:58 (GMT)
commit658c6390a5b363f46c6ad448ad1bce9d6e97e53a (patch)
tree220ce963227820a3c3761e5c7770c4bc90e108fe
parent78761b58fc9ae65acaebb6a9e34087e593c89c93 (diff)
parent8193ed069c0925d6b899afc48986e920cf8ad484 (diff)
downloadgoogletest-658c6390a5b363f46c6ad448ad1bce9d6e97e53a.zip
googletest-658c6390a5b363f46c6ad448ad1bce9d6e97e53a.tar.gz
googletest-658c6390a5b363f46c6ad448ad1bce9d6e97e53a.tar.bz2
Merge pull request #1898 from spartucus/master
Update .gitignore
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 73cdd2c..d6916f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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