Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
fixed crash cause by incorrect font name.
Merge branch 'v3-newaudio' of D:\github_repository\cocosNew into v3
Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions
Merge pull request #1 from cocos2d/v3

Merge pull request #7604 from minggo/xcode-project-fix Xcode project fix
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
add

SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
add

SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
spaces
fix LabelTTF::getBoundingBox() position error
code tidy
tab to spaces
Merge pull request #2 from cocos2d/v3

update
Split luabindings module to some independent modules
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module

Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	tools/tolua/cocos2dx.ini
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of git@github.com:AppleJDay/cocos2d-x.git
Merge pull request #3 from cocos2d/v3

update