OSDN Git Service

[GENERAL] Merge upstream 2018-02-25.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Tue, 27 Feb 2018 15:27:37 +0000 (00:27 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Tue, 27 Feb 2018 15:27:37 +0000 (00:27 +0900)
commitac43ff56aa4ffda24d32d38a53752fd9a77d64ea
tree716e020f079cf53c0ef68abfdabd64b25ebb944c
parentfc1f2bf4acfe3edbee72c81f8cfdc7503700cd9f
[GENERAL] Merge upstream 2018-02-25.
45 files changed:
source/history.txt
source/src/config.cpp
source/src/res/mz1500.rc
source/src/res/mz2200.rc
source/src/res/mz2500.rc
source/src/res/mz800.rc
source/src/res/mz80a.rc
source/src/res/mz80b.rc
source/src/res/pc100.rc
source/src/res/x1turbo.rc
source/src/res/x1turboz.rc
source/src/vm/disk.cpp
source/src/vm/disk.h
source/src/vm/fm16pi/fm16pi.cpp
source/src/vm/fmr30/floppy.cpp
source/src/vm/fmr30/floppy.h
source/src/vm/fmr50/bios.cpp
source/src/vm/fmr50/bios.h
source/src/vm/fmr50/floppy.cpp
source/src/vm/fmr50/floppy.h
source/src/vm/hc20/hc20.cpp
source/src/vm/mb8877.cpp
source/src/vm/mb8877.h
source/src/vm/msx/memory.cpp
source/src/vm/msx/memory_ex.cpp
source/src/vm/mz2500/mz80b.cpp
source/src/vm/mz2500/mz80b.h
source/src/vm/mz2800/floppy.cpp
source/src/vm/mz2800/floppy.h
source/src/vm/mz3500/mz3500.cpp
source/src/vm/mz700/mz700.cpp
source/src/vm/mz700/mz700.h
source/src/vm/mz80k/mz80k.cpp
source/src/vm/mz80k/mz80k.h
source/src/vm/pc100/ioctrl.cpp
source/src/vm/pc100/pc100.cpp
source/src/vm/pc100/pc100.h
source/src/vm/pc6001/floppy.cpp
source/src/vm/pc6031.cpp
source/src/vm/pc98ha/floppy.cpp
source/src/vm/ptf20.cpp
source/src/vm/x1/floppy.cpp
source/src/vm/x1/floppy.h
source/src/vm/x1/x1.cpp
source/src/vm/x1/x1.h