Merge remote-tracking branch 'upstream/dev' into dev-v4-pre1
commit c1284fa4cecc83ebddfe940b880eb349c5aca0a5
2 parents 1fca158 + 8047c05
@Ivan Popelyshev Ivan Popelyshev authored on 31 Mar 2016
Showing 5 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
src/core/textures/BaseTexture.js