diff options
| author | Claus Stovgaard <claus.stovgaard@gmail.com> | 2017-08-31 10:22:53 (GMT) |
|---|---|---|
| committer | Claus Stovgaard <claus.stovgaard@gmail.com> | 2017-08-31 10:22:53 (GMT) |
| commit | 34355c0e870efce3015fa19aff88c7d79839bbb1 (patch) | |
| tree | 0fa858569364bb5818793d97d264aefd365399b5 /.gitignore | |
| parent | a6418a4dd19ea0e8aa5f7706b8bff12a2e453821 (diff) | |
| parent | 16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff) | |
| download | googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.zip googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.tar.gz googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.tar.bz2 | |
Merge remote-tracking branch 'github_google/master' into master-github_frosteyesrefs/pull/865/head
# Conflicts:
# .gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -1,4 +1,12 @@ # Ignore CI build directory build/ +xcuserdata +cmake-build-debug/ +.idea/ +bazel-bin +bazel-genfiles +bazel-googletest +bazel-out +bazel-testlogs # python -*.pyc +*.pyc
\ No newline at end of file |