Merge remote-tracking branch 'ups/master' into 553_find_api

2017-07-08 23:07:57 -07:00
parent baccca843c 2b92996d7c
commit 11de0d0ca0
20 changed files with 12813 additions and 203 deletions
@@ -56,7 +56,7 @@ gulp.task('browserify', ['tsc'], function() {
  let browserifyOptions = {
    basedir: buildDir,
    debug: true,
-    entries: [`../${outDir}/xterm.js`],
+    entries: [`${outDir}/xterm.js`],
    standalone: 'Terminal',
    cache: {},
    packageCache: {}