mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-05 15:30:00 +01:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -19,12 +19,8 @@ rules.ninja
|
||||
|
||||
rsc/shaders/paint.fs
|
||||
|
||||
<<<<<<< master
|
||||
osx/.DS_Store
|
||||
|
||||
.DS_Store
|
||||
|
||||
osx/runvimix
|
||||
=======
|
||||
.vscode/settings.json
|
||||
>>>>>>> OSX compilation
|
||||
|
||||
Reference in New Issue
Block a user