cocos2d/cocos2d-x — pull request #1567 by dumganhar (2012-11-12 02:36:35+00:00)
Title: fixed #1557: Marmalade support (merge PR #1481)

Thank @mrmop.