[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e7932c1eb7daa1f8778df57687f6983fe6712734 (commit)
      from  c47ba4e96c7aa9c2f741f8c89b6440ed2c13b91c (commit)


- Log -----------------------------------------------------------------
commit e7932c1eb7daa1f8778df57687f6983fe6712734
Author: JimC <jim at carroll.com>
Date:   Wed Aug 3 13:53:21 2016 -0400

    Ignore windows generated manifests
    
    - Commit a95ce7f builds *.manifest files on windows -- added them to
      .gitignore.
    
    - ignore pod -> html temp file
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/.gitignore b/.gitignore
index 7deae39..e55ab65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -169,3 +169,7 @@ Makefile.save
 *.bak
 cscope.*
 *.d
+pod2htmd.tmp
+
+# Windows manifest files
+*.manifest