Merge branch 'master' into next-release

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

View file

@ -9,10 +9,10 @@
<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/mda/ibm-mda.xml"/>
<fdc ref="/disks/pc/compiled/library.xml"/>
<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
<debugger id="debugger"/>
<panel ref="/devices/pc/panel/wide.xml"/>
<fdc ref="/disks/pc/compiled/library.xml" width="320px"/>
<chipset id="chipset" model="5160" sw1="01000001"/>
<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
</machine>