diff options
author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-01-12 16:00:39 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-12 16:00:39 +0000 |
commit | 27bb844e5c31a0a67b7b4864ffb2b80ae2803882 (patch) | |
tree | e8cca8f555358fa2ed590a226c8a15a0354dbd80 /.gitignore | |
parent | 8f90d46c8cdd743759821a1c987a70e826d58cef (diff) | |
parent | ed8d02cfc689f26b65e6deb585561c59615b05de (diff) | |
download | googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.gz googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.bz2 googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.zip |
Merge branch 'master' into fix-argc
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -22,3 +22,19 @@ Win32-Debug/ Win32-Release/ x64-Debug/ x64-Release/ + +# Ignore autoconf / automake files +Makefile.in +aclocal.m4 +configure +build-aux/ +autom4te.cache/ +googletest/m4/libtool.m4 +googletest/m4/ltoptions.m4 +googletest/m4/ltsugar.m4 +googletest/m4/ltversion.m4 +googletest/m4/lt~obsolete.m4 + +# Ignore generated directories. +googlemock/fused-src/ +googletest/fused-src/ |