linux
Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb