[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d7c02691a5e6f2716759eacb6f48c39f15ee57c8 (commit)
      from  25a5d1b8c425d9434ed8b2bec53d20ab8c14f886 (commit)


- Log -----------------------------------------------------------------
commit d7c02691a5e6f2716759eacb6f48c39f15ee57c8
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>

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

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

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