OSDN Git Service

[General] Completely merge upstream 2019-01-11.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Sat, 12 Jan 2019 16:12:16 +0000 (01:12 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Sat, 12 Jan 2019 16:12:16 +0000 (01:12 +0900)
commit1bd2ef0d39e50c7d1c0b192540e24c5c934abc44
tree6cc650375fc89e64b447175ccdc34f2d3ae24500
parent2ca526938a8e8b3b9690f304961b024d521e4c93
[General] Completely merge upstream 2019-01-11.
35 files changed:
doc/VMs/pc8801.txt [moved from doc/VMs/pc8801ma.txt with 71% similarity]
doc/VMs/readme.txt
source/history.txt
source/readme.txt
source/src/common.cpp
source/src/qt/avio/CMakeLists.txt
source/src/qt/common/qrc/pc8001.qrc [new file with mode: 0644]
source/src/qt/common/qrc/pc8001mk2.qrc [new file with mode: 0644]
source/src/qt/common/qrc/pc8001mk2sr.qrc
source/src/qt/common/qrc/pc8801.qrc [new file with mode: 0644]
source/src/qt/common/qrc/pc8801ma.qrc
source/src/qt/common/qrc/pc8801mk2.qrc [new file with mode: 0644]
source/src/qt/gui/csp_qt_gui.ts
source/src/qt/machines/pc8801/MainWindow.cpp
source/src/qt/machines/pc8801/pc8801.ts
source/src/res/i18n/ja/csp_qt_gui.qm
source/src/res/i18n/ja/pc8801.qm
source/src/vm/pc9801/pc9801.cpp
source/src/vm/pc9801/pc9801.h
source/src/vm/scsi_cdrom.cpp
source/src/vm/vm.h
source/vc++2008/build9.bat
source/vc++2008/pc8001.vcproj [new file with mode: 0644]
source/vc++2008/pc8001mk2.vcproj [new file with mode: 0644]
source/vc++2008/pc8801.vcproj [new file with mode: 0644]
source/vc++2008/pc8801mk2.vcproj [new file with mode: 0644]
source/vc++2013/build12.bat
source/vc++2013/pc8001.vcxproj [new file with mode: 0644]
source/vc++2013/pc8001.vcxproj.filters [new file with mode: 0644]
source/vc++2013/pc8001mk2.vcxproj [new file with mode: 0644]
source/vc++2013/pc8001mk2.vcxproj.filters [new file with mode: 0644]
source/vc++2013/pc8801.vcxproj [new file with mode: 0644]
source/vc++2013/pc8801.vcxproj.filters [new file with mode: 0644]
source/vc++2013/pc8801mk2.vcxproj [new file with mode: 0644]
source/vc++2013/pc8801mk2.vcxproj.filters [new file with mode: 0644]