Merge branch 'master' into next-release

This commit is contained in:
Jeff Parsons 2016-03-06 11:23:17 -08:00
commit 8b6905c56b

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.30.0/machine.xsl"?>
<machine id="ibm5160" class="pc" border="1" width="1000px" pos="center" background="white">
<name>IBM PC XT (Model 5160), MDA, 64K, 10Mb Drive</name>
<machine id="ibm5160" class="pc" border="1" pos="center" background="white">
<name pos="center">IBM PC XT (Model 5160), MDA, 64K, 10Mb Drive</name>
<computer id="xt-mda-64k" name="IBM PC XT"/>
<cpu id="cpu8088" model="8088"/>
<ram id="ramLow" addr="0x00000"/>