Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into next-release

Browse source
This commit is contained in:
Jeff Parsons 2016-03-06 11:22:47 -08:00
commit 12d4662bbf
173 changed files with 84349 additions and 2592 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devices/pc/machine/5160/ega/640kb/machine.xml
View file

@ -10,8 +10,8 @@
<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json"/>
<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
<fdc ref="/disks/pc/compiled/library.xml"/>
<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
<chipset id="chipset" model="5160" sw1="01001101"/>
<hdc ref="/disks/pc/fixed/win101-ega.xml"/>
<serial id="com2" adapter="2"/>