cocos2d/cocos2d-x — pull request #3108 by minggo (2013-07-09 02:41:37+00:00)
Title: Pitch 7platforms

fixed conflict for #3010.