Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3_EventFrame
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
modify camera attach bug!
fix OBB intersects bug
fix 0.2 version load bug.
Merge pull request #147 from lvlonggame/newcode

camera attach, OBB intersect, fix 0.2 version load bug
remove nodetoparent
Merge branch 'newcode' into v3
Merge branch 'newcode' into v3
1.fixed frame event may forword emit
add arriving last frame event
Fix bug: load sprite3D from cache, the attach node will be discarded.
add getMeshCount method
Merge pull request #149 from lvlonggame/v3

Fix bug: load sprite3D from cache, the attach node will be discarded.
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
new axe.c3b (ver 0.4)
Merge pull request #1 from cocos2d/v3

Cocos2d-x Merge
Merge branch 'v3' into wp8-shader-fix
Add include directories to fix compile error on the window and remove useless `PreBuildEvent`
[ci skip] Update CHANGELOG