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:
#	versions/pcx86/1.30.6/pcx86-dbg.js
#	versions/pcx86/1.30.6/pcx86.js
This commit is contained in:
Jeff Parsons 2017-02-06 17:51:32 -08:00
commit 409ca78a4f
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
_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.33.1 # IMPORTANT: keep pcjs.version in sync with package.json:version
version: 1.34.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