[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  448e6f060e3ae034282f18cb7868f372cf276aaf (commit)
      from  5c5e7e1a7eb114cf136e1ae4b6a413bc48ba41eb (commit)


- Log -----------------------------------------------------------------
commit 448e6f060e3ae034282f18cb7868f372cf276aaf
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>

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

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

diff --git a/.gitignore b/.gitignore
index 6428782..1d5e75b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Object files
 *.o
+*.obj
 
 # editor artefacts
 *.swp
@@ -86,3 +87,15 @@ tags
 TAGS
 cscope.out
 *.d
+
+# Windows
+/tmp32dll
+/out32dll
+/inc32
+/MINFO
+ms/bcb.mak
+ms/libeay32.def
+ms/nt.mak
+ms/ntdll.mak
+ms/ssleay32.def
+ms/version32.rc