Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved ... Conflicts: CHANGELOG cocos/gui/UILayout.h		2014-03-03 11:27:42 -08:00
..
GUI	Merge branch 'develop' into visit_draw_improved	2014-03-03 11:27:42 -08:00
assets-manager	-fixed memleak	2014-02-12 16:48:18 +03:00
physics-nodes	Cache working OK.	2014-02-28 16:10:48 -08:00
proj.win32	Added x64 support for Windows - CCExtensions	2014-01-11 12:31:04 +00:00
Android.mk	issue #4097: Deletes CCEditBoxImplTizen.h/.cpp.	2014-02-20 16:42:28 +08: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