AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
Phillip Stephens 2019-06-30 23:22:54 -07:00
parent dc23ee564d 406d81fd7a
commit b32ed816ec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -33,7 +33,7 @@
url = https://github.com/Tencent/rapidjson.git url = https://github.com/Tencent/rapidjson.git
[submodule "NESEmulator/fixNES"] [submodule "NESEmulator/fixNES"]
path = NESEmulator/fixNES path = NESEmulator/fixNES
url = https://github.com/FIX94/fixNES.git url = https://github.com/Antidote/fixNES.git
[submodule "Editor/locale"] [submodule "Editor/locale"]
path = Editor/locale path = Editor/locale
url = ../urde-translations.git url = ../urde-translations.git

2
NESEmulator/fixNES

@ -1 +1 @@
Subproject commit 09f320439e11276e200c85e7e5f60cfbbdef78e6 Subproject commit 281e9aa1e7b6b3bbe8d499b720484fb547ce6ebd