Update .gitignore with windows files to be excluded from git
authorMatt Caswell <matt@openssl.org>
Fri, 9 Jan 2015 10:19:10 +0000 (10:19 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 9 Jan 2015 11:30:07 +0000 (11:30 +0000)
Reviewed-by: Tim Hudson <tjh@openssl.org>
Conflicts:
.gitignore

.gitignore

index 9658a7a592b23b6654a9345cf67d1b836576e3d1..d8dbed73c55ebe3a0505f467b2c5aa5bbc5e7396 100644 (file)
@@ -1,5 +1,6 @@
 # Object files
 *.o
+*.obj
 
 # editor artefacts
 *.swp
@@ -82,3 +83,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