Merge branch 'dev'

Andrew Start · Andrew Start · commit 62b57b0d50bc · 2015-01-22T18:05:41.000-05:00
diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * pixi.js - v2.1.3
+ * pixi.js - v2.1.5
  * Copyright (c) 2012-2014, Mat Groves
  * http://goodboydigital.com/
  *
diff --git a/bin/pixi.js b/bin/pixi.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "pixi.js",
-    "version": "2.1.4",
+    "version": "2.1.5",
 
     "main": "bin/pixi.dev.js",
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pixi.js",
-    "version": "2.1.3",
+    "version": "2.1.5",
     "description": "Pixi.js is a fast lightweight 2D library that works across all devices.",
 
     "author": "Mat Groves",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pixi.js",`
`3`		`- "version": "2.1.3",`
	`3`	`+ "version": "2.1.5",`
`4`	`4`	`"description": "Pixi.js is a fast lightweight 2D library that works across all devices.",`
`5`	`5`
`6`	`6`	`"author": "Mat Groves",`