OSDN Git Service

[General] Merge upstream 2017-03-08 1/2.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Tue, 14 Mar 2017 15:43:04 +0000 (00:43 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Tue, 14 Mar 2017 15:43:04 +0000 (00:43 +0900)
commit60402cc88adbbe9ebe6614c6154d7d2bba31bad9
tree5524fa4f86a97bc565008886d66b349ad0422661
parent651bea8d1de06452186be96006d6953407b30294
[General] Merge upstream 2017-03-08 1/2.
75 files changed:
source/LICENSE
source/history.txt
source/license/COPYING.txt [moved from source/COPYING.txt with 100% similarity]
source/license/MAME_v99x8/BSD3Clause.txt [new file with mode: 0644]
source/license/emu2212/LICENSE [new file with mode: 0644]
source/readme.txt
source/readme_by_mr_umaiboux.txt [new file with mode: 0644]
source/src/qt/common/qrc/commontexts.qrc
source/src/qt/gui/CMakeLists.txt
source/src/qt/gui/mainwidget_base.h
source/src/qt/gui/menu_main.cpp
source/src/res/fsa1.ico [new file with mode: 0644]
source/src/res/fsa1.rc [new file with mode: 0644]
source/src/res/hx20.ico [new file with mode: 0644]
source/src/res/hx20.rc [new file with mode: 0644]
source/src/res/icon.txt
source/src/res/msx1.rc
source/src/res/msx2.rc
source/src/res/msx2p.ico [new file with mode: 0644]
source/src/res/msx2p.rc [new file with mode: 0644]
source/src/res/px7.rc
source/src/res/resource.h
source/src/vm/disk.cpp
source/src/vm/disk.h
source/src/vm/fmr30/fmr30.cpp
source/src/vm/fmr30/fmr30.h
source/src/vm/fmr30/memory.cpp
source/src/vm/fmr30/memory.h
source/src/vm/msx/joystick.cpp
source/src/vm/msx/kanjirom.cpp [new file with mode: 0644]
source/src/vm/msx/kanjirom.h [new file with mode: 0644]
source/src/vm/msx/memory_ex.cpp [new file with mode: 0644]
source/src/vm/msx/memory_ex.h [new file with mode: 0644]
source/src/vm/msx/msx_ex.cpp [new file with mode: 0644]
source/src/vm/msx/msx_ex.h [new file with mode: 0644]
source/src/vm/msx/printer.cpp [new file with mode: 0644]
source/src/vm/msx/printer.h [new file with mode: 0644]
source/src/vm/msx/psg_stereo.cpp [new file with mode: 0644]
source/src/vm/msx/psg_stereo.h [new file with mode: 0644]
source/src/vm/msx/romtype1.h [new file with mode: 0644]
source/src/vm/msx/romtype2.h [new file with mode: 0644]
source/src/vm/msx/scc.cpp [new file with mode: 0644]
source/src/vm/msx/scc.h [new file with mode: 0644]
source/src/vm/msx/sound_cart.cpp [new file with mode: 0644]
source/src/vm/msx/sound_cart.h [new file with mode: 0644]
source/src/vm/v9938.cpp [new file with mode: 0644]
source/src/vm/v9938.h [new file with mode: 0644]
source/src/vm/vm.h
source/src/vm/ym2413.cpp
source/vc++2008/build9.bat
source/vc++2008/fmr30_i286.vcproj [new file with mode: 0644]
source/vc++2008/fmr30_i86.vcproj [moved from source/vc++2008/fmr30.vcproj with 97% similarity]
source/vc++2008/fsa1.vcproj [new file with mode: 0644]
source/vc++2008/hx20.vcproj [new file with mode: 0644]
source/vc++2008/msx1.vcproj
source/vc++2008/msx2.vcproj
source/vc++2008/msx2p.vcproj [new file with mode: 0644]
source/vc++2008/px7.vcproj
source/vc++2013/build12.bat
source/vc++2013/fmr30_i286.vcxproj [new file with mode: 0644]
source/vc++2013/fmr30_i286.vcxproj.filters [moved from source/vc++2013/fmr30.vcxproj.filters with 100% similarity]
source/vc++2013/fmr30_i86.vcxproj [moved from source/vc++2013/fmr30.vcxproj with 92% similarity]
source/vc++2013/fmr30_i86.vcxproj.filters [new file with mode: 0644]
source/vc++2013/fsa1.vcxproj [new file with mode: 0644]
source/vc++2013/fsa1.vcxproj.filters [new file with mode: 0644]
source/vc++2013/hx20.vcxproj [new file with mode: 0644]
source/vc++2013/hx20.vcxproj.filters [new file with mode: 0644]
source/vc++2013/msx1.vcxproj
source/vc++2013/msx1.vcxproj.filters
source/vc++2013/msx2.vcxproj
source/vc++2013/msx2.vcxproj.filters
source/vc++2013/msx2p.vcxproj [new file with mode: 0644]
source/vc++2013/msx2p.vcxproj.filters [new file with mode: 0644]
source/vc++2013/px7.vcxproj
source/vc++2013/px7.vcxproj.filters