Explorar el Código

hard reset battle_engine, set master to follow origin/push upstream, merge uptoday

SBird1337 hace 7 años
padre
commit
d84d3e1a3d
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  1. 3
    3
      .gitmodules
  2. 1
    1
      battle_engine

+ 3
- 3
.gitmodules Ver fichero

@@ -1,9 +1,9 @@
1 1
 [submodule "sots-private"]
2 2
 	path = sots-private
3 3
 	url = ssh://sotshost:/home/sots-michy/sots-private.git
4
-[submodule "battle_engine"]
5
-	path = battle_engine
6
-	url = https://github.com/SBird1337/battle_engine
7 4
 [submodule "g3headers"]
8 5
 	path = g3headers
9 6
 	url = https://github.com/SBird1337/g3headers
7
+[submodule "battle_engine"]
8
+	path = battle_engine
9
+	url = https://github.com/SBird1337/battle_engine

+ 1
- 1
battle_engine

@@ -1 +1 @@
1
-Subproject commit a201b518834f0208efdb82ac95b08675f5279950
1
+Subproject commit 991e2793854c10885382ad325c55ad42a0585f61