Commit b32ed816 authored by Phillip Stephens's avatar Phillip Stephens

Merge branch 'dev'

parents dc23ee56 406d81fd
Pipeline #11 failed with stages
in 117 minutes and 34 seconds
......@@ -33,7 +33,7 @@
url = https://github.com/Tencent/rapidjson.git
[submodule "NESEmulator/fixNES"]
path = NESEmulator/fixNES
url = https://github.com/FIX94/fixNES.git
url = https://github.com/Antidote/fixNES.git
[submodule "Editor/locale"]
path = Editor/locale
url = ../urde-translations.git
Subproject commit 09f320439e11276e200c85e7e5f60cfbbdef78e6
Subproject commit 281e9aa1e7b6b3bbe8d499b720484fb547ce6ebd
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment