Merge branch 'master' into gh-pages

This commit is contained in:
Jeff Parsons 2017-07-11 20:06:46 -07:00
commit 84f66dc3b7
289 changed files with 2742 additions and 579 deletions

View file

@ -10,7 +10,7 @@ machines:
debugger: true
config: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pcx86/fixed/20mb/IBMOS210-EGA.json"}]'
automount:
autoMount:
A:
name: None
B:

View file

@ -10,7 +10,7 @@ machines:
state: /apps/pcx86/1984/modula2/state.json
config: /devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/MSDOS320-C400.json"}]'
automount:
autoMount:
A:
name: None
B: