cocos2d/cocos2d-x — pull request #6949 by Physwf (2014-05-31 11:07:57+00:00)
Title: 同步

合并原作者更新