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: ibm5170-msdos320
config: /devices/pc/machine/5170/ega/640kb/rev1/machine.xml
automount:
autoMount:
A:
name: MS-DOS 3.20 (Disk 1)
path: /disks/pc/dos/microsoft/3.20/MSDOS320-DISK1.json