Merge branch 'master' into 'BSD-merged', fixing merge conflicts

# Conflicts: # src/threads/thread.c
2024-10-23 16:30:24 +00:00
parent cbb9d52455 0cbae2a2e5
commit ed11c61f87
4 changed files with 285 additions and 16 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,13 @@
 #ignore pdf files (just keep source files)
 *.pdf

+#ignore Mac OS generated files
+.DS_Store
+
+#ignore code editor generated directories
+.idea
+.vscode
+
 #ignore junk files from latex output
 *.out
 *.log