dabing1022/cocos2d-x — pull request #3 by dabing1022 (2013-12-26 06:42:06+00:00)
Title: merge the official update

merge the official update