OSDN Git Service

[VM][General][Qt] Merge Upstream 2015-12-10.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Thu, 10 Dec 2015 07:46:05 +0000 (16:46 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Thu, 10 Dec 2015 07:46:05 +0000 (16:46 +0900)
commit3fe6eddaeb7d6b2ba2c69a06e8cdc05acac690f2
tree27c69e19bec2ae8ecc67c231f67ac6195f96aed9
parent4fb9a494623c08e02e91ee50c086bc2fa69faf47
[VM][General][Qt] Merge Upstream 2015-12-10.
16 files changed:
history.txt
source/src/qt/common/emu_thread.cpp
source/src/qt/common/qt_main.cpp
source/src/qt/osd.cpp
source/src/qt/osd.h
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/vm/fmgen/readme2.txt
source/src/vm/hd46505.cpp
source/src/vm/pc9801/pc9801.cpp
source/src/win32/osd.h
source/src/win32/osd_screen.cpp