[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  a21f4cec14664d8fc5f52dc42ab7119b696521a5 (commit)
      from  434893af2bd4c1fa72655f8e5262c8a432713968 (commit)


- Log -----------------------------------------------------------------
commit a21f4cec14664d8fc5f52dc42ab7119b696521a5
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Oct 2 14:05:14 2018 +0100

    Ignore libcrypto.ld and libssl.ld
    
    These are auto generated files that should not be checked into git
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7339)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b0f25c..30068e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,8 +82,8 @@ Makefile
 /util/shlib_wrap.sh
 /tags
 /TAGS
-/libcrypto.map
-/libssl.map
+*.map
+*.ld
 
 # Windows (legacy)
 /tmp32