Merge remote-tracking branch 'origin/dev' into dev
Conflicts:
	src/extras/cacheAsBitmap.js
commit 87cad6f8b5a35936603aba14da914b6f6cd469dd
2 parents e09eb5d + 6a81bec
@Mat Groves Mat Groves authored on 24 May 2015
Showing 19 changed files
View
bin/pixi.js
View
bin/pixi.js.map
View
bin/pixi.min.js
View
bin/pixi.min.js.map
Not supported
View
bower.json
View
gulp/util/jsdoc.conf.json
View
package.json
View
src/core/const.js
View
src/core/display/Container.js
View
src/core/display/DisplayObject.js
View
src/core/graphics/Graphics.js
View
src/core/graphics/webgl/WebGLGraphicsData.js
View
src/core/math/Matrix.js
View
src/core/renderers/webgl/WebGLRenderer.js
View
src/core/renderers/webgl/shaders/Shader.js
View
src/core/sprites/webgl/SpriteRenderer.js
View
src/core/textures/RenderTexture.js
View
src/extras/cacheAsBitmap.js
View
src/mesh/webgl/MeshRenderer.js