diff options
| author | Hans Nilsson <[email protected]> | 2017-07-06 18:19:09 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-07-06 18:19:09 +0200 |
| commit | 5cdb5f2615b2e4c5272fe6232dd445f0a68ab6d3 (patch) | |
| tree | e3a6ed6d85d0a9ed1aa2b9f54a67f2c8bedaadfc | |
| parent | 9e9ad191ce49eb410c7a95a8410122eed8049755 (diff) | |
| parent | b6afef4b4d1bc5705ba1c838e3f546c454de47c8 (diff) | |
| download | otp-5cdb5f2615b2e4c5272fe6232dd445f0a68ab6d3.tar.gz otp-5cdb5f2615b2e4c5272fe6232dd445f0a68ab6d3.tar.bz2 otp-5cdb5f2615b2e4c5272fe6232dd445f0a68ab6d3.zip | |
Merge branch 'maint'
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index c867b1a597..a79bcf97c4 100644 --- a/.gitignore +++ b/.gitignore @@ -251,6 +251,10 @@ JAVADOC-GENERATED /lib/compiler/test/*_post_opt_SUITE.erl /lib/compiler/test/*_inline_SUITE.erl +# crypto +/lib/crypto/test/crypto_SUITE_data/*.rsp +/lib/crypto/test/crypto_SUITE_data/aesval.html + # debugger /lib/debugger/doc/html/images/*.jpg |