Merge branch 'master' into gh-pages

# Conflicts:
#	devices/pdp11/rl11/README.md
#	disks/dec/README.md
#	disks/dec/rl02k/README.md
This commit is contained in:
Jeff 2016-11-08 10:22:13 -08:00 committed by Jeff Parsons
commit 57315d6882
3 changed files with 71 additions and 47 deletions

View file

@ -155,6 +155,8 @@ pcjs:
- /modules/pdp11/lib/keyboard.js
- /modules/pdp11/lib/serialport.js
- /modules/pdp11/lib/pc11.js
- /modules/pdp11/lib/disk.js
- /modules/pdp11/lib/rl11.js
- /modules/shared/lib/debugger.js
- /modules/pdp11/lib/debugger.js
- /modules/pdp11/lib/computer.js