cocos2d/cocos2d-x — pull request #5241 by dumganhar (2014-01-26 09:59:27+00:00)
Title: Some fixes:

* Updates JS Test to the latest version
* Remove unused files `cocos/2d/cocos2dx.mk`
* Don't define CC_ENABLE_CHIPMUNK_INTEGATION in extension project for android.
* Don't check whether CC_ENABLE_CHIPMUNK_INTEGATION is defined in CCPhysicSprite.h.