OSDN Git Service

[General][Qt] Merge upstream 2015-03-28.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 29 Mar 2015 10:07:08 +0000 (19:07 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 29 Mar 2015 10:07:08 +0000 (19:07 +0900)
commitae68ba9b91f5dcee9ca0db4b3600604b40ff6a46
treeb56e4662f36e02f9435579002daadfef391b7178
parentc3d2dad4eaa7a937a2442c20210a10f47c4c9619
[General][Qt] Merge upstream 2015-03-28.
63 files changed:
history.txt
history_by_mr_tanam.txt [new file with mode: 0644]
readme.txt
readme_by_mr_tanam.txt
source/build-cmake/msx1/CMakeLists.txt
source/fm7.vcproj [new file with mode: 0644]
source/msx1.vcproj [new file with mode: 0644]
source/msx2.vcproj [new file with mode: 0644]
source/src/config.cpp
source/src/emu.h
source/src/res/fm7.rc [new file with mode: 0644]
source/src/res/icon.txt
source/src/res/msx1.rc [new file with mode: 0644]
source/src/res/msx2.rc [new file with mode: 0644]
source/src/res/resource.h
source/src/vm/device.h
source/src/vm/disk.cpp
source/src/vm/disk.h
source/src/vm/fmr30/fmr30.h
source/src/vm/fmr50/fmr50.h
source/src/vm/i286.cpp
source/src/vm/i286.h
source/src/vm/i386.cpp
source/src/vm/i386.h
source/src/vm/i86.cpp
source/src/vm/mame/emu/cpu/i386/i386op16.c
source/src/vm/mame/emu/cpu/i386/i386ops.c
source/src/vm/mame/emu/cpu/i386/i386priv.h
source/src/vm/mame/emu/cpu/i86/i286.c
source/src/vm/mame/emu/cpu/i86/i86.c
source/src/vm/mame/emu/cpu/i86/instr86.c
source/src/vm/mame/emu/cpu/nec/necinstr.c
source/src/vm/mame/emu/cpu/nec/necpriv.h
source/src/vm/mb8877.cpp
source/src/vm/mb8877.h
source/src/vm/mc6809.cpp
source/src/vm/mc6809.h
source/src/vm/msx/CMakeLists.txt [new file with mode: 0644]
source/src/vm/msx/joystick.cpp [moved from source/src/vm/msx1/joystick.cpp with 54% similarity]
source/src/vm/msx/joystick.h [moved from source/src/vm/msx1/joystick.h with 86% similarity]
source/src/vm/msx/keyboard.cpp [moved from source/src/vm/msx1/keyboard.cpp with 65% similarity]
source/src/vm/msx/keyboard.h [moved from source/src/vm/msx1/keyboard.h with 74% similarity]
source/src/vm/msx/memory.cpp [new file with mode: 0644]
source/src/vm/msx/memory.h [new file with mode: 0644]
source/src/vm/msx/msx.cpp [moved from source/src/vm/msx1/msx1.cpp with 72% similarity]
source/src/vm/msx/msx.h [moved from source/src/vm/msx1/msx1.h with 66% similarity]
source/src/vm/msx/rtcif.cpp [new file with mode: 0644]
source/src/vm/msx/rtcif.h [new file with mode: 0644]
source/src/vm/msx1/CMakeLists.txt [deleted file]
source/src/vm/msx1/memory.cpp [deleted file]
source/src/vm/msx1/memory.h [deleted file]
source/src/vm/pc6001/psub.cpp
source/src/vm/pc98ha/pc98ha.h
source/src/vm/v99x8.cpp [new file with mode: 0644]
source/src/vm/v99x8.h [new file with mode: 0644]
source/src/vm/vm.h
source/src/vm/ym2151.cpp
source/src/vm/ym2151.h
source/src/vm/ym2203.cpp
source/src/vm/z80.cpp
source/src/vm/z80.h
source/src/win32_input.cpp
source/src/winmain.cpp