Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev
commit d8e23942ffb2c3773272fbdbd4e45f46f6c176b7
2 parents 053b697 + 569c248
@mathew groves mathew groves authored on 13 Oct 2014
Showing 2 changed files
View
src/pixi/InteractionManager.js
View
src/pixi/renderers/canvas/CanvasRenderer.js