Merge branch 'develop' into feature/enemies

This commit is contained in:
Chris Cromer 2022-08-05 12:16:52 -04:00
commit 7a3b29a419
Signed by: cromer
GPG Key ID: FA91071797BEEEC2
2 changed files with 2 additions and 2 deletions

2
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "godot-cpp"] [submodule "godot-cpp"]
path = godot-cpp path = godot-cpp
url = https://github.com/godotengine/godot-cpp url = https://github.com/godotengine/godot-cpp
branch = 3.4 branch = 3.5

@ -1 +1 @@
Subproject commit ced274fbe62c07dd9bb6791a77392f4bdc625152 Subproject commit 867374da404887337909e8b7b9de5a8acbc47569