Merge branch 'npm_everywhere' of https://github.com/byte-foundry/paper.js into byte-foundry-npm_everywhere

Conflicts:
	package.json
This commit is contained in:
Jürg Lehni 2015-06-15 23:10:29 +02:00
commit 2721ceb579

View file

@ -16,9 +16,7 @@
"browser": "dist/paper-full.js", "browser": "dist/paper-full.js",
"files": [ "files": [
"AUTHORS.md", "AUTHORS.md",
"dist/paper-node.js", "dist/",
"dist/paper-full.js",
"dist/paper-core.js",
"examples/Node.js", "examples/Node.js",
"LICENSE.txt", "LICENSE.txt",
"README.md" "README.md"