Merge branch 'pr/846' into dev
commit 942153624cbb3eea1988945b697381c5a027c08f
2 parents 9a68f77 + 0fa020a
@mathew groves mathew groves authored on 8 Jul 2014
Showing 16 changed files
View
bin/pixi.dev.js
View
bin/pixi.dev.js.map
View
examples/example 2 - SpriteSheet/indexTrim.html
View
src/pixi/display/Sprite.js
View
src/pixi/loaders/JsonLoader.js
View
src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js
View
src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
View
src/pixi/textures/Texture.js
View
trim/SpriteSheet.json 0 → 100644
View
trim/SpriteSheet.png 0 → 100644
View
trim/SpriteSheetTrimmed.json 0 → 100644
View
trim/SpriteSheetTrimmed.png 0 → 100644
View
trim/bikkuriman.png 0 → 100644
View
trim/index.html 0 → 100644
View
trim/index2.html 0 → 100644
View
trim/index3.html 0 → 100644