Merge branch 'master' into dev
commit f5a5d7d5cf4e0f2ee79d58e4cdb9af8a959ddfb4
2 parents 9545271 + 43f5ff7
@Matt Karl Matt Karl authored on 2 Jan 2017
Showing 2 changed files
View
src/core/sprites/Sprite.js
View
src/core/textures/Texture.js