aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorConor Burgess <Burgess.Conor@gmail.com>2018-01-12 16:00:39 +0000
committerGitHub <noreply@github.com>2018-01-12 16:00:39 +0000
commit27bb844e5c31a0a67b7b4864ffb2b80ae2803882 (patch)
treee8cca8f555358fa2ed590a226c8a15a0354dbd80 /.gitignore
parent8f90d46c8cdd743759821a1c987a70e826d58cef (diff)
parented8d02cfc689f26b65e6deb585561c59615b05de (diff)
downloadgoogletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.gz
googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.bz2
googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.zip
Merge branch 'master' into fix-argc
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore16
1 files changed, 16 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4cea432f..b294d3b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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/