Sorry for that, I am new to git and github, it happened when I pulled the changes from the cocos2d-x master