Merge branch 'dev'
# Conflicts:
#	bin/pixi.js
#	bin/pixi.js.map
#	bin/pixi.min.js
#	bin/pixi.min.js.map
1 parent 039200b commit faf4c15dd6187eef50bb62ae90e005b95976263e
@Mat Groves Mat Groves authored on 31 Mar 2016
Showing 13 changed files
View
README.md
View
bin/pixi.js
View
bin/pixi.js.map
View
bin/pixi.min.js
View
bin/pixi.min.js.map
View
package.json
View
src/core/renderers/webgl/WebGLRenderer.js
View
src/core/text/Text.js
View
src/extras/TilingSprite.js
View
src/filters/color/colorMatrix.frag
View
src/interaction/InteractionManager.js
View
src/loaders/spritesheetParser.js
View
src/mesh/Mesh.js