Merge branch 'master' into gh-pages

This commit is contained in:
Jeff Parsons 2016-10-22 00:04:29 -07:00
commit 97dd1b92a8
2 changed files with 2 additions and 2 deletions

View file

@ -16,7 +16,7 @@ All PCjs machines are built from the following sets of devices:
* [6502 Devices](c1p/) (e.g., [Challenger 1P](c1p/machine/))
* [8080 Devices](pc8080/) (e.g., [Space Invaders](pc8080/machine/invaders/), [VT100 Terminal](pc8080/machine/vt100/))
* [8086 Devices](pcx86/) (e.g., [IBM PC and compatibles](pcx86/machine/))
* [PDP-11 Devices](pdp11/) (e.g., [PDP-11/70](pdp11/machine/1170/))
* [PDP-11 Devices](pdp11/) (e.g., [PDP-11/20](pdp11/machine/1120/), [PDP-11/70](pdp11/machine/1170/))
These devices are user-installable components that you would typically find in a real personal computer,
such as keyboards, disk drive controllers with one or more drives, video cards, etc.

View file

@ -15,7 +15,7 @@ The project currently includes these emulation modules:
* [C1Pjs](c1pjs/): 6502 emulation module for the [Challenger 1P](/devices/c1p/)
* [PCx86](pcx86/): x86 emulation module for [IBM PC machines](/devices/pcx86/)
* [PC8080](pc8080/): 8080 emulation module for [8080-based machines](/devices/pc8080/)
* [PDPjs](pdp11/): PDP-11 emulation module for [PDP-11 machines](/devices/pdp11/) (eg, PDP-11/45, PDP-11/70)
* [PDPjs](pdp11/): PDP-11 emulation module for [PDP-11 machines](/devices/pdp11/) (eg, PDP-11/20, PDP-11/70)
along with variety of Node support modules, such as: