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/dos/microsoft/4.0M/README.md
+++ b/disks/pc/dos/microsoft/4.0M/README.md
@ -3,8 +3,9 @@ layout: page
 title: Multitasking MS-DOS 4.00
 permalink: /disks/pc/dos/microsoft/4.0M/
 machines:
-  - type: pc-dbg
+  - type: pc
    id: ibm5160
+    debugger: true
    config: /devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
 ---