[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Matt Caswell]

The branch OpenSSL_1_0_1-stable has been updated
       via  cc6e9f9abb7e6f4c0280212ae382e7ddda82049c (commit)
      from  56cd7404499669a32126b5fee2ff75a97fea43f7 (commit)


- Log -----------------------------------------------------------------
commit cc6e9f9abb7e6f4c0280212ae382e7ddda82049c
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 9 10:19:10 2015 +0000

    Update .gitignore with windows files to be excluded from git
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    
    Conflicts:
    	.gitignore
    
    (cherry picked from commit 04f670cf3d8f22e0d197a071d2db536fb7ebd9c7)

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

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

diff --git a/.gitignore b/.gitignore
index 5a8a402..ce7e59e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Object files
 *.o
+*.obj
 
 # editor artefacts
 *.swp
@@ -77,3 +78,15 @@ Makefile.save
 *.bak
 tags
 TAGS
+
+# Windows
+/tmp32dll
+/out32dll
+/inc32
+/MINFO
+ms/bcb.mak
+ms/libeay32.def
+ms/nt.mak
+ms/ntdll.mak
+ms/ssleay32.def
+ms/version32.rc