OSDN Git Service

[EMU][General] Merge Upsteream 2017-05-28. GUI still not implement.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 28 May 2017 17:58:57 +0000 (02:58 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 28 May 2017 17:58:57 +0000 (02:58 +0900)
commit72cf4e043e9aa0ffa318fe7fa5e42e8f69479569
tree106252a22f3bc7eca5fbef69d3905271b9f9d5ec
parentc481e8b539230f4b19b9ad3fc5927d0675ee009c
[EMU][General] Merge Upsteream 2017-05-28. GUI still not implement.
110 files changed:
source/history.txt
source/src/config.cpp
source/src/config.h
source/src/emu.cpp
source/src/emu.h
source/src/qt/common/emu_thread.cpp
source/src/qt/common/emu_thread.h
source/src/res/babbage2nd.rc
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/fsa1.rc
source/src/res/gamegear.rc
source/src/res/hc20.rc
source/src/res/hc40.rc
source/src/res/hc80.rc
source/src/res/hx20.rc
source/src/res/j3100.rc
source/src/res/jr100.rc
source/src/res/jr800.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/msx2p.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/smb80te.rc
source/src/res/smc70.rc
source/src/res/smc777.rc
source/src/res/tk80bs.rc
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/yis.rc
source/src/res/ys6464a.rc
source/src/res/z80tvgame.rc
source/src/win32/winmain.cpp