Merge branch 'dev' of github.com:GoodBoyDigital/pixi.js into Trompo-SpineUpdate
commit 0f3545f61add99bcd66f821b71e6ac6ec224811a
2 parents bf99001 + aa3e860
@Dario Segura Dario Segura authored on 22 Nov 2014
Showing 2 changed files
View
src/pixi/display/Sprite.js
View
src/pixi/text/Text.js