eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-08 08:50:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Bruno
2021-06-19 09:49:53 +02:00
parent 3086735be1 cf32c9fc12
commit 7253c1ec1a
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

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