Rolando Abarca 47c003ae54 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20		2013-01-11 14:01:42 -08:00
..
Cpp	Fixed and refactored Mac Implementation.	2013-01-09 15:34:53 +01:00
Javascript	Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20	2013-01-11 14:01:42 -08:00
Lua	fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.	2013-01-05 11:10:24 +08:00