Merge remote-tracking branch 'origin/master'

whtns · Dec 8, 2020 · 0d77387 · 0d77387
2 parents 773fd8a + cd0b727
commit 0d77387
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@
 src/*.o
 src/*.so
 src/*.dll
+.DS_Store
+