Merge remote-tracking branch 'upstream/dev' into gr-fixes
commit 7628bec27ce77742b8f5da6fe7815b0870d1a385
2 parents e832df0 + 31bf674
@Steffen Baer Steffen Baer authored on 11 Aug 2015
Showing 3 changed files
View
src/core/display/DisplayObject.js
View
test/lib/pixi/display/DisplayObject.js
View
test/unit/core/display/DisplayObject.test.js 0 → 100644