diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-09-28 21:33:41 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-09-28 21:33:41 +0300 |
commit | cb1e4a8abb33a32da9bec300e0259d50fa2afea9 (patch) | |
tree | c4fdd4076025bb5b612bc88debab62709c311e5f /vendor/gitignore/Autotools.gitignore | |
parent | 2a6e33d838caa813e248de6af603201f5addb7eb (diff) | |
parent | d5734de3d60983fcb3d3f3099d47fe9831e453ad (diff) |
Merge branch 'master' into 'remove-dropzonejs-rails'
# Conflicts:
# Gemfile.lock
Diffstat (limited to 'vendor/gitignore/Autotools.gitignore')
-rw-r--r-- | vendor/gitignore/Autotools.gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/gitignore/Autotools.gitignore b/vendor/gitignore/Autotools.gitignore index ffa6ecc3f9b..f4f545c9ca4 100644 --- a/vendor/gitignore/Autotools.gitignore +++ b/vendor/gitignore/Autotools.gitignore @@ -9,13 +9,15 @@ Makefile.in # http://www.gnu.org/software/autoconf -/autom4te.cache +autom4te.cache /autoscan.log /autoscan-*.log /aclocal.m4 /compile /config.guess /config.h.in +/config.log +/config.status /config.sub /configure /configure.scan @@ -39,4 +41,3 @@ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 -autom4te.cache |