Merge branch 'master' into next-release

This commit is contained in:
Jeff Parsons 2016-01-09 18:02:13 -08:00
commit fe23128a99
25 changed files with 134 additions and 7 deletions

View file

@ -7,7 +7,7 @@ machines:
id: ibm5160
---
IBM PC XT with Color Display
IBM PC XT (Model 5160, 256Kb) with Color Display
---
{% include machine.html id="ibm5160" %}