summaryrefslogtreecommitdiffstats
path: root/.gitignore
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:32:46 +0000
commitaa9296e331f8ad9770838ad8e9179e22b96feb08 (patch)
tree3977956699ca52d7e4ee84d958cfa280a7ef9538 /.gitignore
parentbc253b0902b171895b93ab2e63971ce6f32e9c51 (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) Conflicts: .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore13
1 files changed, 13 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a9fcf4ef66..d5c728a2e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
# Object files
*.o
+*.obj
# editor artefacts
*.swp
@@ -75,3 +76,15 @@
lib
Makefile.save
*.bak
+
+# Windows
+/tmp32dll
+/out32dll
+/inc32
+/MINFO
+ms/bcb.mak
+ms/libeay32.def
+ms/nt.mak
+ms/ntdll.mak
+ms/ssleay32.def
+ms/version32.rc