cocos2d/cocos2d-x — pull request #7339 by super626 (2014-07-08 05:46:42+00:00)
Title: fix android, add 3d files to cocos2d.h and remove unused resources

fix android may crash when change scene after switch background and foreground.

add 3d files to cocos2d.h

resolve conflict cocos2d::Bone and cocostudio::Bone

some adjustment of Bundle3D

remove unused resource