Merged with 'dev'
# Conflicts:
#	src/core/Shader.js
#	src/core/graphics/Graphics.js
#	src/core/math/shapes/Rectangle.js
#	src/core/renderers/webgl/managers/FilterManager.js
#	src/core/sprites/webgl/generateMultiTextureShader.js
commit ebe2e8bb6dc19a9c919568686d2f796fded4170e
2 parents 8416bf3 + 3db826d
@Matt Karl Matt Karl authored on 18 Sep 2016
Showing 7 changed files
View
LICENSE
View
README.md
View
src/core/Shader.js
View
src/core/graphics/Graphics.js
View
src/core/math/shapes/Rectangle.js
View
src/core/renderers/webgl/managers/FilterManager.js
View
src/core/sprites/webgl/generateMultiTextureShader.js