cocos2dx
merge