fix up some merge issues
1 parent 009122b commit 743f9279b343369f35191cb5ee9e05655ee41f7c
@Chad Engler Chad Engler authored on 10 Feb 2014
Showing 2 changed files
View
src/pixi/InteractionManager.js
View
src/pixi/extras/TilingSprite.js