[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  3ec32be78a5d39cd6d1211e61967590f17918284 (commit)
      from  5eb2dd88b3b97a0bdd1929924463b339ef3e141b (commit)


- Log -----------------------------------------------------------------
commit 3ec32be78a5d39cd6d1211e61967590f17918284
Author: Todd Short <tshort at akamai.com>
Date:   Thu Jun 15 15:24:19 2017 -0400

    Add apps/progs.h to gitignore
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3692)

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

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

diff --git a/.gitignore b/.gitignore
index 9c496b2..426e7fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ Makefile
 
 # Auto generated headers
 /crypto/buildinf.h
+/apps/progs.h
 /crypto/include/internal/*_conf.h
 /openssl/include/opensslconf.h
 /util/domd