diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-19 12:54:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 12:54:43 -0400 |
| commit | 61b819721758870d68cc07c07f27cf19004a5e88 (patch) | |
| tree | 4e62778f0cf8752eaea7a4ee3ebe8316fe29f91b | |
| parent | 0c17888bcfa7a05ae2cb14c1f5e2451ea9745211 (diff) | |
| parent | 1370e7658b659247f3c37cd1f07d917d0bd546a0 (diff) | |
| download | googletest-61b819721758870d68cc07c07f27cf19004a5e88.tar.gz googletest-61b819721758870d68cc07c07f27cf19004a5e88.tar.bz2 googletest-61b819721758870d68cc07c07f27cf19004a5e88.zip | |
Merge branch 'master' into master
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -38,3 +38,6 @@ googletest/m4/lt~obsolete.m4 # Ignore generated directories. googlemock/fused-src/ googletest/fused-src/ + +# macOS files +.DS_Store |