cocos2d/cocos2d-x — pull request #9353 by hugebug4ever (2014-12-03 07:13:32+00:00)
Title: Merge pull request #1 from cocos2d/v3

merge from head version