cocos2d/cocos2d-x — pull request #4502 by dumganhar (2013-12-17 07:52:07+00:00)
Title: Merge PR #4499 and compilation fixes

Merge PR #4499 and compilation fixes