Merge branch 'master' into next-release

2016-03-06 11:22:47 -08:00 · 2016-03-06 11:22:47 -08:00 · 12d4662bbf
commit 12d4662bbf
parent ba104d23b2 ae9a4819ec
173 changed files with 84349 additions and 2592 deletions
--- a/disks/pc/windows/win95/4.00.950/README.md
+++ b/disks/pc/windows/win95/4.00.950/README.md
@ -3,8 +3,9 @@ layout: page
 title: "Microsoft Windows 95 (First Retail Release)"
 permalink: /disks/pc/windows/win95/4.00.950/
 machines:
-  - type: pc-dbg
+  - type: pc
    id: deskpro386
+    debugger: true
    config: /devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
 ---

--- a/disks/pc/windows/win95/4.00.950/thumbnail.jpg
+++ b/disks/pc/windows/win95/4.00.950/thumbnail.jpg