Merge branch 'master' of https://github.com/tildearrow/furnace into x1_010

# Conflicts:
#	.gitmodules
#	CMakeLists.txt
This commit is contained in:
cam900 2022-03-07 02:35:14 +09:00
commit fca4bdc1ee
10 changed files with 1022 additions and 8 deletions

3
.gitmodules vendored
View file

@ -22,3 +22,6 @@
[submodule "extern/cam900_vgsound_emu"]
path = extern/cam900_vgsound_emu
url = https://github.com/cam900/vgsound_emu
[submodule "extern/Nuked-OPL3"]
path = extern/Nuked-OPL3
url = https://github.com/nukeykt/Nuked-OPL3.git