diff --git a/.gitignore b/.gitignore index 09ddc0d..214af9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,13 @@ .vs .o -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -.so -*.lib -======= -.so ->>>>>>> parent of 90c45da (Modified Git Ignore) -======= -.so ->>>>>>> parent of 90c45da (Modified Git Ignore) -======= -.so ->>>>>>> parent of 90c45da (Modified Git Ignore) +.obj +.so +.lib +.log +.ifc +.pdb +.recipe +.ipdb +.spv +.iobj +.iik \ No newline at end of file diff --git a/Debug/Drizzle3D.lib b/Debug/Drizzle3D.lib new file mode 100644 index 0000000..d2719ad Binary files /dev/null and b/Debug/Drizzle3D.lib differ