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

Browse source 
# Conflicts:
#	modules/shared/es6/netlib.js
This commit is contained in:
Jeff Parsons 2017-01-31 15:54:41 -08:00 • committed by Jeff Parsons
commit de2fb171ad
2 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

54
_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.32.2 # IMPORTANT: keep pcjs.version in sync with package.json:version
version: 1.33.0 # 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
@ -103,16 +103,16 @@ pcjs:
- /modules/shared/lib/embed.js
- /modules/shared/lib/save.js
pc8080_scripts:
- /modules/shared/es6/defines.js
- /modules/shared/es6/nodebug.js
- /modules/shared/es6/dumpapi.js
- /modules/shared/es6/reportapi.js
- /modules/shared/es6/userapi.js
- /modules/shared/es6/keys.js
- /modules/shared/es6/strlib.js
- /modules/shared/es6/usrlib.js
- /modules/shared/es6/weblib.js
- /modules/shared/es6/component.js
- /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
- /modules/shared/lib/keys.js
- /modules/shared/lib/strlib.js
- /modules/shared/lib/usrlib.js
- /modules/shared/lib/weblib.js
- /modules/shared/lib/component.js
- /modules/pc8080/lib/defines.js
- /modules/pc8080/lib/cpudef.js
- /modules/pc8080/lib/messages.js
@ -128,22 +128,22 @@ pcjs:
- /modules/pc8080/lib/keyboard.js
- /modules/pc8080/lib/video.js
- /modules/pc8080/lib/serial.js
- /modules/shared/es6/debugger.js
- /modules/shared/lib/debugger.js
- /modules/pc8080/lib/debugger.js
- /modules/pc8080/lib/computer.js
- /modules/shared/es6/state.js
- /modules/shared/es6/embed.js
- /modules/shared/lib/state.js
- /modules/shared/lib/embed.js
pdp11_scripts:
- /modules/shared/es6/defines.js
- /modules/shared/es6/nodebug.js
- /modules/shared/es6/dumpapi.js
- /modules/shared/es6/reportapi.js
- /modules/shared/es6/userapi.js
- /modules/shared/es6/keys.js
- /modules/shared/es6/strlib.js
- /modules/shared/es6/usrlib.js
- /modules/shared/es6/weblib.js
- /modules/shared/es6/component.js
- /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
- /modules/shared/lib/keys.js
- /modules/shared/lib/strlib.js
- /modules/shared/lib/usrlib.js
- /modules/shared/lib/weblib.js
- /modules/shared/lib/component.js
- /modules/pdp11/lib/defines.js
- /modules/pdp11/lib/messages.js
- /modules/pdp11/lib/panel.js
@ -162,8 +162,8 @@ pcjs:
- /modules/pdp11/lib/drive.js
- /modules/pdp11/lib/rk11.js
- /modules/pdp11/lib/rl11.js
- /modules/shared/es6/debugger.js
- /modules/shared/lib/debugger.js
- /modules/pdp11/lib/debugger.js
- /modules/pdp11/lib/computer.js
- /modules/shared/es6/state.js
- /modules/shared/es6/embed.js
- /modules/shared/lib/state.js
- /modules/shared/lib/embed.js