Merge branch 'master' into next-release

2016-01-09 18:02:13 -08:00 · 2016-01-09 18:02:13 -08:00 · fe23128a99
commit fe23128a99
parent a63b5326c0 cdff68669e
25 changed files with 134 additions and 7 deletions
--- a/disks/pc/windows/win95/4.00.950/README.md
+++ b/disks/pc/windows/win95/4.00.950/README.md
@ -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" %}