Merge branch 'next-release'

This commit is contained in:
Jeff Parsons 2016-05-23 17:23:02 -07:00
commit fd96ae7308
4 changed files with 7 additions and 4 deletions

3
.gitignore vendored
View file

@ -1,3 +1,6 @@
*.bin
*.lst
*.obj
*.IMG *.IMG
*.dsk *.dsk
*.img *.img

View file

@ -11,7 +11,7 @@ redirect_from:
Device Configurations Device Configurations
--- ---
All PCjs machines are built from the following collections of devices: All PCjs machines are built from the following sets of devices:
* [6502-based Devices](c1p/) (e.g., [Challenger 1P](c1p/machine/)) * [6502-based Devices](c1p/) (e.g., [Challenger 1P](c1p/machine/))
* [8080-based Devices](pc8080/) (e.g., [Space Invaders](pc8080/machine/invaders/)) * [8080-based Devices](pc8080/) (e.g., [Space Invaders](pc8080/machine/invaders/))

View file

@ -1,6 +1,6 @@
--- ---
layout: page layout: page
title: IBM PC (Model 5150, 64Kb) with Color Display title: IBM PC (Model 5150, 64Kb, Color Display) running Donkey 1.00
permalink: /devices/pcx86/machine/5150/cga/64kb/donkey/ permalink: /devices/pcx86/machine/5150/cga/64kb/donkey/
redirect_from: redirect_from:
- /devices/pc/machine/5150/cga/64kb/donkey/ - /devices/pc/machine/5150/cga/64kb/donkey/
@ -12,7 +12,7 @@ machines:
id: ibm5150 id: ibm5150
--- ---
IBM PC with Color Display IBM PC Running Donkey 1.00
--- ---
{% include machine.html id="ibm5150" %} {% include machine.html id="ibm5150" %}

View file

@ -1,6 +1,6 @@
--- ---
layout: page layout: page
title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display running Windows 1.01 title: IBM PC XT (Model 5160, 256Kb, 10Mb Drive, Color Display) running Windows 1.01
permalink: /devices/pcx86/machine/5160/cga/256kb/win101/ permalink: /devices/pcx86/machine/5160/cga/256kb/win101/
redirect_from: redirect_from:
- /devices/pc/machine/5160/cga/256kb/win101/ - /devices/pc/machine/5160/cga/256kb/win101/