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/ibm/1.00/README.md
+++ b/disks/pc/dos/ibm/1.00/README.md
@ -6,7 +6,7 @@ machines:
  - type: pc
    id: ibm5150-pcdos100
    config: /devices/pc/machine/5150/mda/64kb/machine.xml
-    automount:
+    autoMount:
      A:
        path: /disks/pc/dos/ibm/1.00/PCDOS100.json
 ---
--- a/disks/pc/dos/ibm/1.10/README.md
+++ b/disks/pc/dos/ibm/1.10/README.md
@ -6,7 +6,7 @@ machines:
  - type: pc
    id: ibm5150-pcdos110
    config: /devices/pc/machine/5150/mda/64kb/machine.xml
-    automount:
+    autoMount:
      A:
        path: /disks/pc/dos/ibm/1.10/PCDOS110.json
 ---