Merge branch 'ground_effects_editor' of https://gitlab.com/T1ti/noggit-red into ground_effects_editor
# Conflicts: # .gitignore # CMakeLists.txt
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,6 +1,7 @@
|
||||
|
||||
/out
|
||||
/bin
|
||||
/build
|
||||
/.vs
|
||||
/CMakePresets.json
|
||||
/CMakeUserPresets.json
|
||||
/CMakeUserPresets.json
|
||||
|
||||
Reference in New Issue
Block a user