samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager ... nter # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2014-10-16 10:59:58 +08:00
..
GUI	scheduler and macro fixes	2014-10-03 09:38:36 -07:00
assets-manager	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager	2014-10-16 10:59:58 +08:00
physics-nodes	Fixed my mistakes - preprocessor.	2014-09-22 14:25:47 +09:00
Android.mk	no message	2014-10-09 18:30:39 +08:00
CMakeLists.txt	no message	2014-10-09 18:30:39 +08:00
ExtensionDeprecated.cpp	remove ccscale9sprite , cceditBox	2014-09-01 17:06:22 +08:00
ExtensionDeprecated.h	remove ccscale9sprite , cceditBox	2014-09-01 17:06:22 +08:00
ExtensionExport.h	added check for WinRT and WP8	2014-10-14 16:46:23 -07: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	no message	2014-10-09 18:30:39 +08:00