Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into gh-pages, and fix a few issues related to autoStart

Browse source 
# Conflicts:
#	_posts/2016-12-02-the-pdp-11-and-vt100-revisited.md
#	docs/pcx86/examples/pcx86-dbg.js
#	docs/pcx86/examples/pcx86.js
This commit is contained in:
Jeff Parsons 2016-12-04 11:26:10 -08:00 • committed by Jeff Parsons
commit 9ed580066c
33 changed files with 348 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

4
_config.yml
View file

@ -34,7 +34,7 @@ gems:
pcjs:
domain: pcjs.org # whereas site.url is used for linking purposes, site.pcjs.domain is used for display purposes
version: 1.30.5 # IMPORTANT: keep pcjs.version in sync with package.json:version
version: 1.30.6 # IMPORTANT: keep pcjs.version in sync with package.json:version
compiled: true # by default, the compiled pcjs.version scripts will be used (eg, pcx86.js or pcx86-dbg.js)
c1p_scripts: # if pcjs.compiled is false, the following scripts will be included instead, in the order listed
- /modules/shared/lib/defines.js
@ -104,6 +104,7 @@ pcjs:
- /modules/shared/lib/save.js
pc8080_scripts:
- /modules/shared/lib/defines.js
- /modules/shared/lib/nodebug.js
- /modules/shared/lib/dumpapi.js
- /modules/shared/lib/reportapi.js
- /modules/shared/lib/userapi.js
@ -134,6 +135,7 @@ pcjs:
- /modules/shared/lib/embed.js
pdp11_scripts:
- /modules/shared/lib/defines.js
- /modules/shared/lib/nodebug.js
- /modules/shared/lib/dumpapi.js
- /modules/shared/lib/reportapi.js
- /modules/shared/lib/userapi.js