dabing1022/cocos2d-x — pull request #7 by dabing1022 (2014-02-24 06:53:40+00:00)
Title: merge the official update

merge the official update