OSDN Git Service

[General][VM] Merge upstream 2015-08-07 .
authorK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 7 Aug 2015 16:04:29 +0000 (01:04 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 7 Aug 2015 16:04:29 +0000 (01:04 +0900)
commit705226faa676f974cc12a67fd8c3c351e375f857
treef70fdd52bfe552aa0a1cc0bdad10e615c560543b
parentdd48ca610dd712333186b31ce604369d577e05b7
[General][VM] Merge upstream 2015-08-07 .
[MZ2500] Fix FTBFS.
24 files changed:
history.txt
source/src/config.cpp
source/src/res/mz1200.rc
source/src/res/mz1500.rc
source/src/res/mz2200.rc
source/src/res/mz2500.rc
source/src/res/mz700.rc
source/src/res/mz800.rc
source/src/res/mz80a.rc
source/src/res/mz80b.rc
source/src/res/mz80k.rc
source/src/res/resource.h
source/src/vm/datarec.cpp
source/src/vm/datarec.h
source/src/vm/disk.cpp
source/src/vm/disk.h
source/src/vm/fm7/fm7.h
source/src/vm/fmr30/fmr30.h
source/src/vm/fmr50/bios.cpp
source/src/vm/fmr50/bios.h
source/src/vm/fmr50/fmr50.h
source/src/vm/mb8877.cpp
source/src/vm/mz2500/mz2500.cpp
source/src/vm/mz2500/mz2500.h