summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2018-08-21 17:52:17 +0200
committerRickard Green <rickard@erlang.org>2018-08-21 17:52:17 +0200
commit1b9829f78970547659d73ed5d437f0b66d69c40f (patch)
tree1c3f58009669f268ba92339a6c59ce46b4094c1a /.gitignore
parent1b9aae1a5dd812933543615c3c25bd3321ec4061 (diff)
parentb3f4e9ee21b1f400b3c26c18c56ebc1ec13b5b4e (diff)
downloaderlang-1b9829f78970547659d73ed5d437f0b66d69c40f.tar.gz
Merge branch 'rickard/crypto-configure/OTP-15129'
* rickard/crypto-configure/OTP-15129: Move configuration of crypto to crypto application from erts
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index cf0da64a43..fee8cba0c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -210,6 +210,7 @@ JAVADOC-GENERATED
/lib/wx/autoconf/config.guess
/lib/wx/autoconf/config.sub
/lib/wx/autoconf/install-sh
+/lib/crypto/aclocal.m4
#
# Files generated when building/running tests (especially if