OSDN Git Service

[GENERAL] Merge upstream 2017-03-04. Still checking FTBFSs.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 5 Mar 2017 23:11:49 +0000 (08:11 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 5 Mar 2017 23:11:49 +0000 (08:11 +0900)
commit6c509007b0ae89e7006b58cd51d59b88ad59d5e2
tree7004488352991a57668b122baa3596c09fc26749
parent46922a45a71fef16b74c5dc03f5d3ead94a739de
[GENERAL] Merge upstream 2017-03-04. Still checking FTBFSs.
224 files changed:
source/history.txt
source/src/common.h
source/src/config.cpp
source/src/config.h
source/src/emu.cpp
source/src/res/bmjr.rc
source/src/res/colecovision.rc
source/src/res/ex80.rc
source/src/res/familybasic.rc
source/src/res/fm16pi.rc
source/src/res/fm7.rc
source/src/res/fm77.rc
source/src/res/fm77av.rc
source/src/res/fm77av40.rc
source/src/res/fm77av40ex.rc
source/src/res/fm8.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/fp200.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/jr100.rc
source/src/res/jx.rc
source/src/res/m5.rc
source/src/res/map1010.rc
source/src/res/mastersystem.rc
source/src/res/msx1.rc
source/src/res/msx2.rc
source/src/res/multi8.rc
source/src/res/mycomz80a.rc
source/src/res/mz1200.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/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/n5200.rc
source/src/res/pasopia.rc
source/src/res/pasopia7.rc
source/src/res/pasopia7lcd.rc
source/src/res/pc100.rc
source/src/res/pc2001.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/pc8201.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/pcengine.rc
source/src/res/phc20.rc
source/src/res/phc25.rc
source/src/res/pv1000.rc
source/src/res/pv2000.rc
source/src/res/px7.rc
source/src/res/pyuta.rc
source/src/res/qc10.rc
source/src/res/qc10cms.rc
source/src/res/resource.h
source/src/res/rx78.rc
source/src/res/sc3000.rc
source/src/res/scv.rc
source/src/res/smc70.rc
source/src/res/smc777.rc
source/src/res/tk80bs.rc
source/src/res/tk85.ico [new file with mode: 0644]
source/src/res/tk85.rc
source/src/res/x07.rc
source/src/res/x1.rc
source/src/res/x1turbo.rc
source/src/res/x1turboz.rc
source/src/res/x1twin.rc
source/src/res/yalky.rc
source/src/res/z80tvgame.rc
source/src/vm/ay_3_891x.cpp
source/src/vm/ay_3_891x.h
source/src/vm/common_vm/CMakeLists.txt
source/src/vm/datarec.cpp
source/src/vm/datarec.h
source/src/vm/device.h
source/src/vm/event.cpp
source/src/vm/event.h
source/src/vm/fm16pi/fm16pi.cpp
source/src/vm/fm7/CMakeLists.txt
source/src/vm/fm7/kanjirom.cpp
source/src/vm/fmgen/CMakeLists.txt
source/src/vm/fmgen/fmgen.cpp
source/src/vm/fmgen/fmgen.h
source/src/vm/fmgen/fmtimer.h
source/src/vm/fmgen/headers.h
source/src/vm/fmgen/opm.h
source/src/vm/fmgen/opna.cpp
source/src/vm/fmgen/opna.h
source/src/vm/fmgen/psg.cpp
source/src/vm/fmgen/psg.h
source/src/vm/fmr50/bios.cpp
source/src/vm/gamegear/mastersystem.cpp
source/src/vm/hc20/hc20.cpp
source/src/vm/i286.h
source/src/vm/i386.h
source/src/vm/libcpu_newdev/device.cpp
source/src/vm/libcpu_newdev/device.h
source/src/vm/mb8877.h
source/src/vm/mc6800.h
source/src/vm/msm5205.cpp
source/src/vm/msx/joystick.cpp
source/src/vm/msx/msx.cpp
source/src/vm/msx/msx.h
source/src/vm/multi8/multi8.cpp
source/src/vm/multi8/multi8.h
source/src/vm/mz5500/mz5500.cpp
source/src/vm/mz5500/mz5500.h
source/src/vm/n5200/n5200.cpp
source/src/vm/pc6001/joystick.cpp
source/src/vm/pc6001/pc6001.cpp
source/src/vm/pc6001/pc6001.h
source/src/vm/pcm1bit.cpp
source/src/vm/pcm1bit.h
source/src/vm/phc25/joystick.cpp
source/src/vm/phc25/phc25.cpp
source/src/vm/phc25/phc25.h
source/src/vm/scsi_cdrom.cpp
source/src/vm/scsi_host.cpp
source/src/vm/smb80te/smb80te.cpp
source/src/vm/sn76489an.h
source/src/vm/tk80bs/tk80bs.cpp
source/src/vm/upd1990a.h
source/src/vm/upd71071.cpp
source/src/vm/upd7801.cpp
source/src/vm/vm.h
source/src/vm/x1/joystick.cpp
source/src/win32/winmain.cpp
source/vc++2008/fm7.vcproj
source/vc++2008/fm77.vcproj
source/vc++2008/fm77av.vcproj
source/vc++2008/fm77av40.vcproj
source/vc++2008/fm77av40ex.vcproj
source/vc++2008/fm8.vcproj
source/vc++2008/map1010.vcproj
source/vc++2008/msx1.vcproj
source/vc++2008/msx2.vcproj
source/vc++2008/multi8.vcproj
source/vc++2008/mz5500.vcproj
source/vc++2008/mz6500.vcproj
source/vc++2008/mz6550.vcproj
source/vc++2008/pc6001.vcproj
source/vc++2008/pc6001mk2.vcproj
source/vc++2008/pc6601.vcproj
source/vc++2008/phc25.vcproj
source/vc++2008/px7.vcproj
source/vc++2008/x1.vcproj
source/vc++2008/x1turbo.vcproj
source/vc++2008/x1turboz.vcproj
source/vc++2008/x1twin.vcproj
source/vc++2013/fm7.vcxproj
source/vc++2013/fm7.vcxproj.filters
source/vc++2013/fm77.vcxproj
source/vc++2013/fm77.vcxproj.filters
source/vc++2013/fm77av.vcxproj
source/vc++2013/fm77av.vcxproj.filters
source/vc++2013/fm77av40.vcxproj
source/vc++2013/fm77av40.vcxproj.filters
source/vc++2013/fm77av40ex.vcxproj
source/vc++2013/fm77av40ex.vcxproj.filters
source/vc++2013/fm8.vcxproj
source/vc++2013/fm8.vcxproj.filters
source/vc++2013/map1010.vcxproj
source/vc++2013/map1010.vcxproj.filters
source/vc++2013/msx1.vcxproj
source/vc++2013/msx1.vcxproj.filters
source/vc++2013/msx2.vcxproj
source/vc++2013/msx2.vcxproj.filters
source/vc++2013/multi8.vcxproj
source/vc++2013/multi8.vcxproj.filters
source/vc++2013/mz5500.vcxproj
source/vc++2013/mz5500.vcxproj.filters
source/vc++2013/mz6500.vcxproj
source/vc++2013/mz6500.vcxproj.filters
source/vc++2013/mz6550.vcxproj
source/vc++2013/mz6550.vcxproj.filters
source/vc++2013/pc6001.vcxproj
source/vc++2013/pc6001.vcxproj.filters
source/vc++2013/pc6001mk2.vcxproj
source/vc++2013/pc6001mk2.vcxproj.filters
source/vc++2013/pc6601.vcxproj
source/vc++2013/pc6601.vcxproj.filters
source/vc++2013/phc25.vcxproj
source/vc++2013/phc25.vcxproj.filters
source/vc++2013/px7.vcxproj
source/vc++2013/px7.vcxproj.filters
source/vc++2013/x1.vcxproj
source/vc++2013/x1.vcxproj.filters
source/vc++2013/x1turbo.vcxproj
source/vc++2013/x1turbo.vcxproj.filters
source/vc++2013/x1turboz.vcxproj
source/vc++2013/x1turboz.vcxproj.filters
source/vc++2013/x1twin.vcxproj
source/vc++2013/x1twin.vcxproj.filters