James Chen 77538c53e9 Merge pull request #5241 from dumganhar/develop ... 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 and CCPhysicDebugNode.h, check it in source file.		2014-01-26 04:08:05 -08:00
..
2d	Removes unused files.	2014-01-26 17:54:13 +08:00
audio	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
base	The implementation of Object::release was moved to cpp source file.	2014-01-26 18:34:48 +08:00
editor-support	closed #3833: SceneTest of CocoStudio crashes	2014-01-24 11:50:58 +08:00
gui	Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int	2014-01-20 15:03:30 +08:00
math/kazmath	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
network	fix link error on vs.	2014-01-25 19:41:20 +08:00
physics	Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071	2014-01-26 16:41:35 +08:00
scripting	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug	2014-01-26 17:22:49 +08:00
storage/local-storage	[Win32] fix localStorageGetItem crash when column text is NULL.	2014-01-22 17:37:29 +09:00