OSDN Git Service

[VM][General][Qt] Merge upstream 2015-12-31.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Wed, 6 Jan 2016 15:15:57 +0000 (00:15 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Wed, 6 Jan 2016 15:15:57 +0000 (00:15 +0900)
commitf259b4e04723c1e0634497f34b95a0520004693a
treefd201f2ae8c036e51c1b28030486f353d5cd8ac4
parent65d7fa331fe1d6b0ccb12c40d5eb27c31c500af9
[VM][General][Qt] Merge upstream 2015-12-31.
[UI][Qt] Fix indent of machines/*/MainWidget.cpp .
95 files changed:
history.txt
source/build-cmake/cmake/config_mz2500.cmake
source/build-cmake/cmake/config_pc8801.cmake
source/build-cmake/cmake/config_x1.cmake
source/mz2500.vcproj
source/src/common.cpp
source/src/common.h
source/src/emu.cpp
source/src/emu.h
source/src/qt/gui/commonclasses.h
source/src/qt/gui/mainwidget.h
source/src/qt/gui/mainwindow_utils.cpp
source/src/qt/gui/menu_control.cpp
source/src/qt/gui/menu_main.cpp
source/src/qt/machines/babbage2nd/MainWindow.cpp
source/src/qt/machines/bmjr/MainWindow.cpp
source/src/qt/machines/ex80/MainWindow.cpp
source/src/qt/machines/familybasic/MainWindow.cpp
source/src/qt/machines/fm16pi/MainWindow.cpp
source/src/qt/machines/fm7/MainWindow.cpp
source/src/qt/machines/fmr30/MainWindow.cpp
source/src/qt/machines/fmr50/MainWindow.cpp
source/src/qt/machines/fp1100/MainWindow.cpp
source/src/qt/machines/fp200/MainWindow.cpp
source/src/qt/machines/gamegear/MainWindow.cpp
source/src/qt/machines/hc20/MainWindow.cpp
source/src/qt/machines/hc40/MainWindow.cpp
source/src/qt/machines/hc80/MainWindow.cpp
source/src/qt/machines/j3100/MainWindow.cpp
source/src/qt/machines/jr100/MainWindow.cpp
source/src/qt/machines/jx/MainWindow.cpp
source/src/qt/machines/m5/MainWindow.cpp
source/src/qt/machines/msx/MainWindow.cpp
source/src/qt/machines/multi8/MainWindow.cpp
source/src/qt/machines/mycomz80a/MainWindow.cpp
source/src/qt/machines/mz2500/MainWindow.cpp
source/src/qt/machines/mz2800/MainWindow.cpp
source/src/qt/machines/mz3500/MainWindow.cpp
source/src/qt/machines/mz5500/MainWindow.cpp
source/src/qt/machines/mz700/MainWindow.cpp
source/src/qt/machines/mz80k/MainWindow.cpp
source/src/qt/machines/n5200/MainWindow.cpp
source/src/qt/machines/pasopia/MainWindow.cpp
source/src/qt/machines/pasopia7/MainWindow.cpp
source/src/qt/machines/pc100/MainWindow.cpp
source/src/qt/machines/pc6001/MainWindow.cpp
source/src/qt/machines/pc8201/MainWindow.cpp
source/src/qt/machines/pc8801/MainWindow.cpp
source/src/qt/machines/pc9801/MainWindow.cpp
source/src/qt/machines/pc98ha/MainWindow.cpp
source/src/qt/machines/pcengine/MainWindow.cpp
source/src/qt/machines/phc20/MainWindow.cpp
source/src/qt/machines/phc25/MainWindow.cpp
source/src/qt/machines/pv1000/MainWindow.cpp
source/src/qt/machines/pv2000/MainWindow.cpp
source/src/qt/machines/pyuta/MainWindow.cpp
source/src/qt/machines/qc10/MainWindow.cpp
source/src/qt/machines/rx78/MainWindow.cpp
source/src/qt/machines/sc3000/MainWindow.cpp
source/src/qt/machines/scv/MainWindow.cpp
source/src/qt/machines/smc777/MainWindow.cpp
source/src/qt/machines/tk80bs/MainWindow.cpp
source/src/qt/machines/x07/MainWindow.cpp
source/src/qt/machines/x1/MainWindow.cpp
source/src/qt/machines/ys6464a/MainWindow.cpp
source/src/qt/machines/z80tvgame/MainWindow.cpp
source/src/qt/osd.h
source/src/qt/osd_screen.cpp
source/src/res/babbage2nd.png
source/src/res/mz2500.rc
source/src/res/resource.h
source/src/res/tk80bs.png
source/src/res/ys6464a.png
source/src/vm/fm7/fm7.h
source/src/vm/mame/emu/cpu/i386/i386priv.h
source/src/vm/mame/emu/cpu/i86/i86.c
source/src/vm/mz1p17.cpp [new file with mode: 0644]
source/src/vm/mz1p17.h [new file with mode: 0644]
source/src/vm/mz2500/CMakeLists.txt
source/src/vm/mz2500/mz2500.cpp
source/src/vm/mz2500/mz2500.h
source/src/vm/mz2500/printer.cpp [new file with mode: 0644]
source/src/vm/mz2500/printer.h [new file with mode: 0644]
source/src/vm/pc6001/pc6001.cpp
source/src/vm/pc8801/pc8801.cpp
source/src/vm/pc9801/pc9801.cpp
source/src/vm/pc98ha/pc98ha.cpp
source/src/vm/prnfile.cpp
source/src/vm/prnfile.h
source/src/vm/x1/display.cpp
source/src/vm/x1/x1.cpp
source/src/vm/x1/x1.h
source/src/win32/osd.h
source/src/win32/osd_screen.cpp
source/src/winmain.cpp