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/games/infocom/zork1/debugger/machine.md
+++ b/disks/pc/games/infocom/zork1/debugger/machine.md
@ -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" %}
--- a/disks/pc/games/infocom/zork1/machine.md
+++ b/disks/pc/games/infocom/zork1/machine.md
@ -8,7 +8,7 @@ machines:
    config: /disks/pc/games/infocom/machine.xml
 ---

-Zork
+Zork I
 ---

 {% include machine.html id="ibm5150" %}