diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-08-31 16:12:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 16:12:27 +0200 |
| commit | 84bd72ba3cc7e8c9f46558154413946ab8048d4d (patch) | |
| tree | 4034727008c9a00677bcf26fdb9c9dd98f3e416d | |
| parent | 14cf7f574a4fac65525620e552577b7f57c9b867 (diff) | |
| parent | a430e9c176bd78d5deed693b1239dc96c95a1ec2 (diff) | |
| download | googletest-84bd72ba3cc7e8c9f46558154413946ab8048d4d.tar.gz googletest-84bd72ba3cc7e8c9f46558154413946ab8048d4d.tar.bz2 googletest-84bd72ba3cc7e8c9f46558154413946ab8048d4d.zip | |
Merge branch 'master' into hethi/fix-faq-example-comment
| -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 |