summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-09 10:19:10 +0000
committerMatt Caswell <matt@openssl.org>2015-01-09 11:30:50 +0000
commite9cb6eb1d379c62b75e16d0e12a0b939323befc5 (patch)
treeadc458911f3c2e40e6a2d212d64cf72ff87790bb
parent181ae2badb8620c65075b70d5ca1f9c18891d290 (diff)
Update .gitignore with windows files to be excluded from git
Reviewed-by: Tim Hudson <tjh@openssl.org> Conflicts: .gitignore (cherry picked from commit 04f670cf3d8f22e0d197a071d2db536fb7ebd9c7)
-rw-r--r--.gitignore13
1 files changed, 13 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5a8a40272d..ce7e59e3d0 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