cocos2d/cocos2d-x — pull request #8929 by xiaozihan2011 (2014-10-25 04:04:34+00:00)
Title: Merge pull request #1 from cocos2d/v3

update