OSDN Git Service

[GENERAL][BUILD] Merge upstream 2015-07-31.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 31 Jul 2015 06:44:02 +0000 (15:44 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 31 Jul 2015 06:44:02 +0000 (15:44 +0900)
commit212d15cc6196acd5481e2fa66fa1df32d16d5e7e
tree169fe9f844ee09842884228afbfc2c1d41b82d40
parent002c2c90889560fab221f6c0c9336924d819151f
[GENERAL][BUILD] Merge upstream 2015-07-31.
175 files changed:
history.txt
source/babbage2nd.vcproj
source/build-cmake/pc8801ma/CMakeLists.txt
source/familybasic.vcproj
source/fm16pi.vcproj
source/fm7.vcproj
source/fm77.vcproj
source/fm77av.vcproj
source/fmr30.vcproj
source/fmr50_i286.vcproj
source/fmr50_i386.vcproj
source/fmr50_i486.vcproj
source/fmr60.vcproj
source/fmr70.vcproj
source/fmr80.vcproj
source/fp1100.vcproj
source/fp200.vcproj
source/gamegear.vcproj
source/hc20.vcproj
source/hc40.vcproj
source/hc80.vcproj
source/j3100gt.vcproj
source/j3100sl.vcproj
source/jx.vcproj
source/m5.vcproj
source/map1010.vcproj
source/mastersystem.vcproj
source/msx1.vcproj
source/msx2.vcproj
source/multi8.vcproj
source/mycomz80a.vcproj
source/mz1200.vcproj
source/mz1500.vcproj
source/mz2200.vcproj
source/mz2500.vcproj
source/mz2800.vcproj
source/mz3500.vcproj
source/mz5500.vcproj
source/mz6500.vcproj
source/mz6550.vcproj
source/mz700.vcproj
source/mz800.vcproj
source/mz80a.vcproj
source/mz80b.vcproj
source/mz80k.vcproj
source/n5200.vcproj
source/pasopia.vcproj
source/pasopia7.vcproj
source/pasopia7lcd.vcproj
source/pc100.vcproj
source/pc6001.vcproj
source/pc6001mk2.vcproj
source/pc6001mk2sr.vcproj
source/pc6601.vcproj
source/pc6601sr.vcproj
source/pc8001mk2sr.vcproj
source/pc8201.vcproj
source/pc8201a.vcproj
source/pc8801ma.vcproj
source/pc9801.vcproj
source/pc9801e.vcproj
source/pc9801u.vcproj
source/pc9801vf.vcproj
source/pc9801vm.vcproj
source/pc98do.vcproj
source/pc98ha.vcproj
source/pc98lt.vcproj
source/pcengine.vcproj
source/phc20.vcproj
source/phc25.vcproj
source/pv1000.vcproj
source/pv2000.vcproj
source/px7.vcproj
source/pyuta.vcproj
source/qc10.vcproj
source/qc10cms.vcproj
source/rx78.vcproj
source/sc3000.vcproj
source/scv.vcproj
source/src/config.cpp
source/src/config.h
source/src/res/fm16pi.rc
source/src/res/fm7.png [new file with mode: 0644]
source/src/res/fm7.rc
source/src/res/fm77.rc
source/src/res/fm77av.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/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/jx.rc
source/src/res/msx1.rc
source/src/res/msx2.rc
source/src/res/multi8.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/mz800.rc
source/src/res/mz80a.rc
source/src/res/mz80b.rc
source/src/res/n5200.rc
source/src/res/pasopia.rc
source/src/res/pasopia7.rc
source/src/res/pc100.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/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/qc10.rc
source/src/res/qc10cms.rc
source/src/res/resource.h
source/src/res/sc3000.rc
source/src/res/x1.ico
source/src/res/x1.rc
source/src/res/x1turbo.rc
source/src/res/x1turboz.rc
source/src/res/x1twin.rc
source/src/vm/disk.cpp
source/src/vm/disk.h
source/src/vm/fm7/floppy.cpp
source/src/vm/fm7/fm7_mainio.h
source/src/vm/fmgen/fmtimer.cpp
source/src/vm/mb8877.cpp
source/src/vm/mb8877.h
source/src/vm/pc6001/floppy.h
source/src/vm/pc6001/pc6001.cpp
source/src/vm/pc6031.h
source/src/vm/pc80s31k.cpp
source/src/vm/pc8801/pc88.cpp
source/src/vm/pc8801/pc88.h
source/src/vm/pc8801/pc8801.cpp
source/src/vm/pc8801/pc8801.h
source/src/vm/pc9801/pc9801.cpp
source/src/vm/pc9801/pc9801.h
source/src/vm/upd765a.cpp
source/src/vm/upd765a.h
source/src/vm/ym2151.cpp
source/src/vm/ym2151.h
source/src/vm/ym2203.cpp
source/src/vm/ym2203.h
source/src/winmain.cpp
source/tk80bs.vcproj
source/x07.vcproj
source/x1.vcproj
source/x1turbo.vcproj
source/x1turboz.vcproj
source/x1twin.vcproj
source/ys6464a.vcproj
source/z80tvgame_i8255.vcproj
source/z80tvgame_z80pio.vcproj