Skip to content

Commit

Permalink
Merge pull request #6 from mbasso/master
Browse files Browse the repository at this point in the history
Update develop with commits to master.
  • Loading branch information
mbasso committed Oct 16, 2017
2 parents 76c9444 + 6f377f7 commit d4878b3
Show file tree
Hide file tree
Showing 180 changed files with 51,675 additions and 14,151 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"transform-es3-member-expression-literals",
"transform-es3-property-literals"
],
"ignore": [
"*.asm.js"
],
"env": {
"commonjs": {
"plugins": [
Expand Down
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = tab
indent_style = space
indent_size = 2

[*.md]
Expand Down
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
**/dist/**
**/node_modules/**
**/src/helpers/**
**/compiled/**
**/test/**/*.asm.js
**/src/js/prefix.js
**/src/js/postfix.js
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ es
coverage
_book
.nyc_output
.vscode
.vscode
test/cpp/app.asm.js
TODO.md
package-lock.json
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js
node_js:
- "7"
- "8"
install: true
script:
- npm install --ignore-scripts
Expand Down
89 changes: 0 additions & 89 deletions Analysis.md

This file was deleted.

Loading

0 comments on commit d4878b3

Please sign in to comment.