Merge branch 'master' into gh-pages

This commit is contained in:
Jeff Parsons 2017-07-02 21:42:16 -07:00
commit 49b73c10d4
87 changed files with 248443 additions and 172 deletions

View file

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