Merge branch 'master' into gh-pages

This commit is contained in:
Jeff Parsons 2017-06-20 10:55:50 -07:00
commit 3d27599635
3 changed files with 18 additions and 6 deletions

View file

@ -10,7 +10,11 @@ machines:
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"}]'
automount: ''
automount:
A:
name: None
B:
name: None
---
Just for fun (because I have a warped sense of fun), I decided to revisit some of the old OS/2 software I wrote

View file

@ -8,11 +8,15 @@ machines:
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"}]'
automount: ''
automount:
A:
name: None
B:
name: None
---
IBM OS/2 1.0
---
------------
IBM OS/2 1.0 was announced on April 2, 1987, finalized in October 1987, and released in December 1987.

View file

@ -6,14 +6,18 @@ machines:
- type: pcx86
id: ibm5170
debugger: true
messages: fault
config: /devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/IBMOS211-VGA.json"}]'
automount: ''
messages: fault
automount:
A:
name: None
B:
name: None
---
IBM OS/2 1.1
---
------------
IBM OS/2 1.1 was announced on April 2, 1987 (the same day as OS/2 1.0) and released on October 31, 1988.