Merge remote-tracking branch 'origin/master'

This commit is contained in:
Bruno
2021-06-19 09:49:53 +02:00

4
.gitignore vendored
View File

@@ -19,12 +19,8 @@ rules.ninja
rsc/shaders/paint.fs
<<<<<<< master
osx/.DS_Store
.DS_Store
osx/runvimix
=======
.vscode/settings.json
>>>>>>> OSX compilation