Merge branch 'master' into next-release

This commit is contained in:
Jeff Parsons 2016-01-09 18:02:13 -08:00
commit fe23128a99
25 changed files with 134 additions and 7 deletions

View file

@ -0,0 +1,12 @@
---
layout: page
title: IBM PC XT (Model 5160)
permalink: /devices/pc/machine/5160/cga/256kb/
redirect_from:
- /configs/pc/machines/5160/cga/256kb/
---
IBM PC XT (Model 5160, 256Kb) with Color Display
---
All our 256Kb Model 5160, aka IBM PC XT, configurations are located here.

View file

@ -7,7 +7,7 @@ machines:
id: ibm5160
---
IBM PC XT with Color Display
IBM PC XT (Model 5160, 256Kb) with Color Display
---
{% include machine.html id="ibm5160" %}

View file

@ -2,6 +2,8 @@
layout: page
title: "IBM PC XT (Model 5160, 640Kb) with EGA Display running Windows 1.01"
permalink: /devices/pc/machine/5160/ega/640kb/win101/
redirect_from:
- /configs/pc/machines/5160/ega/640kb/win101/
machines:
- type: pc
id: ibm5160

View file

@ -73,11 +73,11 @@ that automatically run the software.
* Microsoft Windows 2.03
* Microsoft Windows 3.00
* Microsoft Windows 3.11
* Microsoft Windows 95
* [Microsoft Windows 95](/disks/pc/windows/win95/4.00.950/)
### Other Operating Systems
* [CP/M-86 1.1B](/disks/pc/cpm/1.1b/)
* [CP/M-86](/disks/pc/cpm/)
* Minix 1.1
* PC/IX 1.0
* [Microport's AT&T UNIX System V-AT 2.3](/disks/pc/unix/microport/system-v/2.3/)

View file

@ -1,9 +1,7 @@
---
layout: page
title: "IBM PC (Model 5150) running CP/M-86"
title: "IBM PC (Model 5150) running CP/M-86 v1.1b"
permalink: /disks/pc/cpm/1.1b/
redirect_from:
- /disks/pc/cpm/
machines:
- type: pc
id: ibm5150

12
disks/pc/cpm/README.md Normal file
View file

@ -0,0 +1,12 @@
---
layout: page
title: CP/M-86
permalink: /disks/pc/cpm/
---
CP/M-86
---
The following versions of CP/M-86 are available:
* [CP/M-86 1.1b](/disks/pc/cpm/1.1b/)

View file

@ -0,0 +1,13 @@
---
layout: page
title: "IBM PC (Model 5150) running Zork with Debugger"
permalink: /disks/pc/games/infocom/zork1/debugger/
machines:
- type: pc
id: ibm5150
---
Zork I
---
{% include machine.html id="ibm5150" %}

View file

@ -8,7 +8,7 @@ machines:
config: /disks/pc/games/infocom/machine.xml
---
Zork
Zork I
---
{% include machine.html id="ibm5150" %}

View file

@ -45,6 +45,7 @@
<manifest ref="/disks/pc/windows/2.03/manifest.xml"/>
<manifest ref="/disks/pc/windows/3.00/manifest.xml"/>
<manifest ref="/disks/pc/windows/3.11/manifest.xml"/>
<manifest ref="/disks/pc/windows/win95/4.00.499/manifest.xml"/>
<manifest ref="/disks/pc/windows/win95/4.00.950/manifest.xml"/>
<manifest ref="/disks/pc/minix/1.1/manifest.xml"/>
<manifest ref="/disks/pc/unix/ibm/pcix/1.0/manifest.xml"/>

View file

@ -0,0 +1,16 @@
---
layout: page
title: "Microsoft Windows 95 (Build 499)"
permalink: /disks/pc/windows/win95/4.00.499/
redirect_from:
- /disks/pc/windows/win95/build499/
---
Microsoft Windows 95 (Build 499)
---
This version of Windows 95 was one of the last (if not THE last) test versions produced before the
[final retail version](/disks/pc/windows/win95/4.00.950/)
was released to manufacturing on July 14, 2015 and later went on sale at midnight on August 24, 1995.
The PCjs Project has the only known version of this 13-disk test release.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.18.8/manifest.xsl"?>
<manifest type="software">
<title>Windows 95 (Build 499)</title>
<disk id="disk01" size="1474560" chs="80:2:18" img="../static/4.00.499/WIN95-DISK01.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK01.json" md5="732d1cb011be22d1beda31f4dcd8ea56" md5json="6fa3bc43a08502be56bcf765c2470c35">
<name>Windows 95 (Build 499 Disk 1)</name>
</disk>
<disk id="disk02" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK02.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK02.json" md5="3c4ff0741307c736fd956447b82db041" md5json="5688fde3e3f978e4d31127b118383f79">
<name>Windows 95 (Build 499 Disk 2)</name>
</disk>
<disk id="disk03" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK03.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK03.json" md5="7c635a4d309ecc182db99dd3e6642bac" md5json="939be24d14aff97578200c8429ca4a05">
<name>Windows 95 (Build 499 Disk 3)</name>
</disk>
<disk id="disk04" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK04.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK04.json" md5="59e781f887857883108d3e0a4ea338bc" md5json="4f62253c0731ac0d87d6cdbdc218a921">
<name>Windows 95 (Build 499 Disk 4)</name>
</disk>
<disk id="disk05" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK05.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK05.json" md5="4866930efb5198e6e9c9ea6958989547" md5json="e9b2b53575ee7ca1546be36f9c36d143">
<name>Windows 95 (Build 499 Disk 5)</name>
</disk>
<disk id="disk06" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK06.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK06.json" md5="99d60c50db21206908d569db0d859f5d" md5json="48aa2717c9cbcc46639cef839eed5378">
<name>Windows 95 (Build 499 Disk 6)</name>
</disk>
<disk id="disk07" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK07.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK07.json" md5="c4eb6a910b5310427e3099c079c62261" md5json="75f2d3b963e81c1b37c725f350971562">
<name>Windows 95 (Build 499 Disk 7)</name>
</disk>
<disk id="disk08" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK08.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK08.json" md5="d6ba0299f3f02851ac2cc44ed54dbcc3" md5json="2b89cfd0f05934bdc4cca15064f0d7d4">
<name>Windows 95 (Build 499 Disk 8)</name>
</disk>
<disk id="disk09" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK09.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK09.json" md5="308387d3c51e837fd7869a7b0b44a3cb" md5json="4a86ce9737eb664450c351fb274f940c">
<name>Windows 95 (Build 499 Disk 9)</name>
</disk>
<disk id="disk10" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK10.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK10.json" md5="1cc5e299dfb83dd555227ad9546393fe" md5json="dbee2d4261d25c235f01278fded36a0b">
<name>Windows 95 (Build 499 Disk 10)</name>
</disk>
<disk id="disk11" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK11.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK11.json" md5="abe21872967030c77c4b1c5acc330944" md5json="40d23db1b9fd26cb728854aaf3a1d4f8">
<name>Windows 95 (Build 499 Disk 11)</name>
</disk>
<disk id="disk12" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK12.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK12.json" md5="55a8eabe146455de6d724912608c4dae" md5json="f609a685c6a4e98447193a969d342a10">
<name>Windows 95 (Build 499 Disk 12)</name>
</disk>
<disk id="disk13" size="1720320" chs="80:2:21" img="../static/4.00.499/WIN95-DISK13.img" href="/disks/pc/windows/win95/4.00.499/WIN95-DISK13.json" md5="9842dbeabf3b7dc98ee727467c81cef6" md5json="4de833b8106fa20db8b760c2c2633123">
<name>Windows 95 (Build 499 Disk 13)</name>
</disk>
</manifest>

View file

@ -0,0 +1,16 @@
---
layout: page
title: "Microsoft Windows 95 (First Retail Release)"
permalink: /disks/pc/windows/win95/4.00.950/
machines:
- type: pc-dbg
id: deskpro386
config: /devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
---
Microsoft Windows 95 (First Retail Release)
---
More information about the Windows 95 demo below is available in the [PCjs Blog](/blog/2015/09/21/).
{% include machine.html id="deskpro386" %}