GoodBoyDigital/pixi.js — pull request #15 by ewdicus (2013-03-21 05:00:00+00:00)
Title: Removed some merge conflict tags from Detector.js

Just noticed these while poking around.