[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  542591740667b17642ad300c357b5d8045c8ccda (commit)
      from  cae70cfd46d9b266c9e4a32c8a588235663ce091 (commit)


- Log -----------------------------------------------------------------
commit 542591740667b17642ad300c357b5d8045c8ccda
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Aug 31 21:45:56 2015 +0200

    Ignore .dir-locals.el
    
    Because we recently encourage people to have a .dir-locals.el, it's a good
    idea to ignore it on a git level.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit d7c02691a5e6f2716759eacb6f48c39f15ee57c8)

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

Summary of changes:
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index bb3feab..36c3a37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 .#*
 #*#
 *~
+/.dir-locals.el
 
 # Top level excludes
 /Makefile.bak