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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Bruno
2021-06-19 00:50:31 +02:00
parent c6ac35addb 6cc5a8af9e
commit 1d94d494b6
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -20,9 +20,12 @@ rules.ninja
rsc/shaders/paint.fs
.vscode/settings.json
<<<<<<< HEAD
osx/.DS_Store
.DS_Store
osx/runvimix
=======
>>>>>>> dev