OSDN Git Service

[General] Merge upstream 2015-04-07.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Tue, 7 Apr 2015 18:40:37 +0000 (03:40 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Tue, 7 Apr 2015 18:40:37 +0000 (03:40 +0900)
commit27a172ceb355adbaa7060c7f1902bdc73e33391e
treead4820296f8f001b68c2ecd73cd138c3e6e07214
parentefedf66063e9bf58344de469d690016b4b2ce187
[General] Merge upstream 2015-04-07.
[VM][FM7] Fix memory leak of keyboard. Thanks to Takeda san.
141 files changed:
history.txt
readme.txt
source/build8.bat
source/build8.bat.orig [new file with mode: 0644]
source/build8.bat.rej [new file with mode: 0644]
source/fm7.vcproj
source/fm77av.vcproj [new file with mode: 0644]
source/fp200.vcproj
source/fp200.vcproj.orig [new file with mode: 0644]
source/fp200.vcproj.rej [new file with mode: 0644]
source/msx1.vcproj
source/msx2.vcproj
source/px7.vcproj
source/px7.vcproj.orig [new file with mode: 0644]
source/px7.vcproj.rej [new file with mode: 0644]
source/src/common.h
source/src/res/afxres.h
source/src/res/babbage2nd.rc
source/src/res/familybasic.rc
source/src/res/fm16pi.rc
source/src/res/fm7.ico [new file with mode: 0644]
source/src/res/fm7.rc
source/src/res/fm77av.ico [new file with mode: 0644]
source/src/res/fm77av.rc [new file with mode: 0644]
source/src/res/fm8.ico [new file with mode: 0644]
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/icon.txt
source/src/res/j3100.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.ico [new file with mode: 0644]
source/src/res/msx1.rc
source/src/res/msx2.ico [new file with mode: 0644]
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/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/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/tk80bs.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/ys6464a.rc
source/src/vm/datarec.cpp
source/src/vm/datarec.h
source/src/vm/fm7/display.cpp
source/src/vm/fm7/floppy.cpp
source/src/vm/fm7/fm7.cpp
source/src/vm/fm7/fm7.h
source/src/vm/fm7/fm7_keyboard.h
source/src/vm/fm7/keyboard.cpp
source/src/vm/hc20/hc20.cpp
source/src/vm/hc20/hc20.h
source/src/vm/hc20/memory.cpp
source/src/vm/hc20/memory.h
source/src/vm/mb8877.h
source/src/vm/msx/msx.cpp
source/src/vm/msx/msx.h
source/src/vm/mz700/mz700.cpp
source/src/vm/mz700/mz700.h
source/src/vm/mz80k/mz80k.cpp
source/src/vm/mz80k/mz80k.h
source/src/vm/pc6001/floppy.h
source/src/vm/pc6001/pc6001.cpp
source/src/vm/pc6001/pc6001.h
source/src/vm/pc6001/psub.h
source/src/vm/pc6031.h
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/floppy.h
source/src/vm/pc9801/pc9801.cpp
source/src/vm/pc9801/pc9801.h
source/src/vm/pc98ha/pc98ha.cpp
source/src/vm/pc98ha/pc98ha.h
source/src/vm/upd765a.h
source/src/vm/vm.h
source/src/vm/x1/x1.cpp
source/src/vm/x1/x1.h