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

merge the official update