Merge branch 'master' into dev

mrdoob · mrdoob · commit 38caaf8a2367 · 2016-09-22T09:37:33.000-07:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "three",
-  "version": "0.81.1",
+  "version": "0.81.2",
   "description": "JavaScript 3D library",
   "main": "build/three.js",
   "files": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "three",`
`3`		`- "version": "0.81.1",`
	`3`	`+ "version": "0.81.2",`
`4`	`4`	`"description": "JavaScript 3D library",`
`5`	`5`	`"main": "build/three.js",`
`6`	`6`	`"files": [`