James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create ... Conflicts: cocos2dx/extensions/CCBReader/CCBReader_v2.cpp cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp cocos2dx/label_nodes/CCLabelBMFont.cpp cocos2dx/menu_nodes/CCMenuItem.cpp cocos2dx/menu_nodes/CCMenuItem.h cocos2dx/misc_nodes/CCRenderTexture.h cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp tests/tests/LabelTest/LabelTest.cpp		2012-06-14 17:36:31 +08:00
..
CCEventType.h	fixed #1185: reload image data and recreate buffer of object when backing to foreground	2012-04-24 15:02:18 +08:00
CCProtocols.h	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'	2012-04-19 14:35:52 +08:00
ccConfig.h	fixed #1180: synchronize CCConfiguration	2012-04-20 11:39:12 +08:00
ccMacros.h	issue #1310: synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest	2012-06-11 18:25:57 +08:00
ccTypes.h	issue #1322: vertical alignment ok on iOS	2012-06-13 16:20:58 +08:00
cocos2d.h	issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder.	2012-06-14 16:05:58 +08:00
cocos2dExt.h	issue #1194: Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView.	2012-04-27 18:47:49 +08:00