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

@ -6,7 +6,7 @@ machines:
- type: pc
id: ibm5150-compaq111
config: /devices/pc/machine/5150/mda/64kb/machine.xml
automount:
autoMount:
A:
path: /disks/pc/dos/compaq/1.11/COMPAQ-DOS111.json
---

View file

@ -6,7 +6,7 @@ machines:
- type: pc
id: ibm5150-compaq112
config: /devices/pc/machine/5150/mda/64kb/machine.xml
automount:
autoMount:
A:
path: /disks/pc/dos/compaq/1.12/COMPAQ-DOS112.json
---

View file

@ -6,7 +6,7 @@ machines:
- type: pc
id: ibm5160-compaq212
config: /devices/pc/machine/5160/mda/256kb/machine.xml
automount:
autoMount:
A:
path: /disks/pc/dos/compaq/2.12/COMPAQ-DOS212.json
---