lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 ... Conflicts: cocos/2d/cocos2d.vcxproj.filters cocos/3d/CCBundle3D.cpp cocos/3d/CCBundle3D.h		2014-06-12 15:53:41 +08:00
..
GUI	Merge pull request #6999 from iSevenDays/patch-12	2014-06-09 09:46:55 +08:00
assets-manager	issue #4729: NULL -> nullptr in constructor or setXXX(NULL)	2014-04-10 00:36:43 +08:00
physics-nodes	Adds setNormalizedPosition()	2014-05-30 16:42:05 -07:00
proj.win32	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-06-12 15:53:41 +08:00
proj.wp8	updated project settings	2014-04-19 10:13:12 -07:00
Android.mk	Moves cocos/2d/Android.mk to cocos/Android.mk	2014-05-01 14:09:26 -07:00
CMakeLists.txt	issue #4097: Deletes CCEditBoxImplTizen.h/.cpp.	2014-02-20 16:42:28 +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	Updates CCPhysicsDebugNode.h/.cpp, don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in header file.	2014-01-26 19:35:21 +08:00