Merge branch 'develop' of https://github.com/LLK/scratch-vm into es6

# Conflicts:
#	src/import/sb2import.js
#	src/virtual-machine.js
#	webpack.config.js
This commit is contained in:
Ray Schamp 2017-04-19 17:54:31 -04:00
commit e96807b399
16 changed files with 189 additions and 150 deletions

View file

@ -9,7 +9,7 @@ var base = {
host: '0.0.0.0',
port: process.env.PORT || 8073
},
devtool: 'source-map',
devtool: 'cheap-module-source-map',
module: {
rules: [{
test: /\.js$/,