branch
add shader log
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
branch
no message
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
add submodule tag
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into develop
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into develop

Conflicts:
	cocos/renderer/CCGLProgram.cpp
	plugin
	tools/bindings-generator
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3

Conflicts:
	plugin
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into develop
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3

Conflicts:
	tools/bindings-generator