Merge branch 'next-release'

This commit is contained in:
Jeff Parsons 2017-02-08 11:06:50 -08:00
commit 6faca036cc
12 changed files with 6 additions and 289723 deletions

View file

@ -9,7 +9,7 @@ machines:
id: ibm5170
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"}]'
drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/IBMOS210-EGA.json"}]'
automount: ''
---

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -9,7 +9,7 @@ machines:
id: ibm5170
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"}]'
drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/IBMOS210-EGA.json"}]'
automount: ''
---

View file

@ -9,7 +9,7 @@ machines:
id: ibm5170
debugger: true
config: /devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pcx86/fixed/20mb/IBMOS211-VGA.json"}]'
drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/IBMOS211-VGA.json"}]'
automount: ''
messages: fault
---

View file

@ -10,7 +10,7 @@ machines:
id: deskpro386
state: deskpro386.json
config: /devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pcx86/fixed/20mb/COMPAQ310-WIN386201-VGA.json"}]'
drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/COMPAQ310-WIN386201-VGA.json"}]'
autoMount: ''
---

View file

@ -9,7 +9,7 @@ machines:
- type: pcx86
id: ibm5170-win300
config: /devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pcx86/fixed/20mb/PCDOS320-WIN300-EGA.json"}]'
drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/PCDOS320-WIN300-EGA.json"}]'
autoMount: ''
---

View file

@ -8,7 +8,7 @@ machines:
- type: pcx86
id: ibm5170-win310
config: /devices/pcx86/machine/5170/vga/2048kb/machine.xml
drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pcx86/fixed/20mb/PCDOS330-WIN310-VGA.json"}]'
drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/PCDOS330-WIN310-VGA.json"}]'
autoMount: ''
---