diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-31 11:13:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 11:13:09 -0400 |
| commit | 7f27d8bdd1f44c1dfc758ccfdd82e97af5af36b6 (patch) | |
| tree | 6f253a49e5317a06a69c8b5d03a806b0b728bf98 | |
| parent | d6c46ebd04e2e4f36fd799b43e2fd5342c10a891 (diff) | |
| parent | a430e9c176bd78d5deed693b1239dc96c95a1ec2 (diff) | |
| download | googletest-7f27d8bdd1f44c1dfc758ccfdd82e97af5af36b6.tar.gz googletest-7f27d8bdd1f44c1dfc758ccfdd82e97af5af36b6.tar.bz2 googletest-7f27d8bdd1f44c1dfc758ccfdd82e97af5af36b6.zip | |
Merge branch 'master' into hethi/issue-1175-cmake-build-type
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | googletest/.gitignore | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -8,3 +8,5 @@ bazel-genfiles bazel-googletest bazel-out bazel-testlogs +# python +*.pyc
\ No newline at end of file diff --git a/googletest/.gitignore b/googletest/.gitignore deleted file mode 100644 index 4b7be4b9..00000000 --- a/googletest/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# python -*.pyc |