From 409ca78a4f604c0e324502e4c128d6c6488882a0 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Mon, 6 Feb 2017 17:51:32 -0800 Subject: [PATCH] Merge branch 'master' into gh-pages # Conflicts: # versions/pcx86/1.30.6/pcx86-dbg.js # versions/pcx86/1.30.6/pcx86.js --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 3a2cf483c..6f0de3da6 100644 --- a/_config.yml +++ b/_config.yml @@ -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