OSDN Git Service

[General][VM][Qt] Merge upstream 2015-08-05 .
authorK.Ohta <whatisthis.sowhat@gmail.com>
Thu, 6 Aug 2015 13:53:32 +0000 (22:53 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Thu, 6 Aug 2015 13:53:32 +0000 (22:53 +0900)
commitf98e6ac0bc324f554c79dc27ded20bc88d5c6f29
treed0b2e29471274582b4b9cb55326e2c635b2efc5b
parent8cd39b717a3db9145c827c7475d84c6cca652c99
[General][VM][Qt] Merge upstream 2015-08-05 .
80 files changed:
history.txt
source/src/config.cpp
source/src/config.h
source/src/emu.h
source/src/fileio.cpp
source/src/qt/gui/commonclasses.h
source/src/qt/gui/mainwidget.h
source/src/qt/gui/menu_disk.cpp
source/src/qt/gui/util_fd.cpp
source/src/res/fm16pi.rc
source/src/res/fm7.rc
source/src/res/fm77.rc
source/src/res/fm77av.rc
source/src/res/fmr30.rc
source/src/res/fmr50_i286.rc
source/src/res/fmr50_i386.rc
source/src/res/fmr50_i486.rc
source/src/res/fmr60.rc
source/src/res/fmr70.rc
source/src/res/fmr80.rc
source/src/res/fp1100.rc
source/src/res/gamegear.rc
source/src/res/hc20.rc
source/src/res/hc40.rc
source/src/res/hc80.rc
source/src/res/j3100.rc
source/src/res/jx.rc
source/src/res/msx1.rc
source/src/res/msx2.rc
source/src/res/multi8.rc
source/src/res/mz1500.rc
source/src/res/mz2200.rc
source/src/res/mz2500.rc
source/src/res/mz2800.rc
source/src/res/mz3500.rc
source/src/res/mz5500.rc
source/src/res/mz6500.rc
source/src/res/mz6550.rc
source/src/res/mz800.rc
source/src/res/mz80a.rc
source/src/res/mz80b.rc
source/src/res/n5200.rc
source/src/res/pasopia.rc
source/src/res/pasopia7.rc
source/src/res/pc100.rc
source/src/res/pc6001.rc
source/src/res/pc6001mk2.rc
source/src/res/pc6001mk2sr.rc
source/src/res/pc6601.rc
source/src/res/pc6601sr.rc
source/src/res/pc8001mk2sr.rc
source/src/res/pc8801ma.rc
source/src/res/pc9801.rc
source/src/res/pc9801e.rc
source/src/res/pc9801u.rc
source/src/res/pc9801vf.rc
source/src/res/pc9801vm.rc
source/src/res/pc98do.rc
source/src/res/pc98ha.rc
source/src/res/pc98lt.rc
source/src/res/qc10.rc
source/src/res/qc10cms.rc
source/src/res/resource.h
source/src/res/sc3000.rc
source/src/res/x1.rc
source/src/res/x1turbo.rc
source/src/res/x1turboz.rc
source/src/res/x1twin.rc
source/src/vm/disk.cpp
source/src/vm/disk.h
source/src/vm/fm7/fm7.h
source/src/vm/fmr50/bios.cpp
source/src/vm/mame/emu/cpu/i86/i286.c
source/src/vm/mb8877.cpp
source/src/vm/mb8877.h
source/src/vm/msx/memory.cpp
source/src/vm/upd765a.cpp
source/src/vm/z80sio.cpp
source/src/vm/z80sio.h
source/src/winmain.cpp