WuHuan 16367b7594 solve conflicted with math.h isnan		2014-01-10 14:20:00 +08:00
..
GUI	solve conflicted with math.h isnan	2014-01-10 14:20:00 +08:00
assets-manager	Linux fix missing file -> rename dir loadSceneEditorFileTest to LoadScene...; add string::npos; const correctness	2014-01-04 19:26:16 -03:00
physics-nodes	issue #2171: Fixing compilation errors for Linux port.	2013-12-17 14:50:40 +08:00
proj.win32	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
Android.mk	issue #2790: Removes CCSort.h/.cpp from projects.	2013-12-07 14:21:01 +08:00
CMakeLists.txt	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
ExtensionMacros.h	issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.	2012-09-25 17:26:09 +08:00
cocos-ext.h	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00