aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2018-01-08 14:15:01 +0000
committerYann Herklotz <ymherklotz@gmail.com>2018-01-08 14:15:01 +0000
commitcbd6bf4a695370dbfc088bbe0cd6f270e1c112a7 (patch)
treeb8b9770364e95182bdba53511f018283625a4970
parentc514e44b73b3fc4db492e4bd333fa223c6c1eef5 (diff)
parent36cb2edec56eb653bae30635db6db6650b8b3f9a (diff)
downloadYAGE-cbd6bf4a695370dbfc088bbe0cd6f270e1c112a7.tar.gz
YAGE-cbd6bf4a695370dbfc088bbe0cd6f270e1c112a7.zip
Merge branch 'develop' into entity
-rw-r--r--.gitmodules3
m---------external/Box2D0
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 1cac6ea5..e44a021f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,3 +18,6 @@
path = tests/external/googletest
url = https://github.com/google/googletest.git
branch = master
+[submodule "external/Box2D"]
+ path = external/Box2D
+ url = https://github.com/erincatto/Box2D.git
diff --git a/external/Box2D b/external/Box2D
new file mode 160000
+Subproject 7e633c4fb86a68bf072fb8ae67ea2c060114750