bruce0505/cocos2d-x — pull request #1 by bruce0505 (2014-05-22 09:42:28+00:00)
Title: 合并主干得更新

合并主干得更新