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
..
CCBReader	CCNodeLoader.h: Added parameter names.	2012-06-13 15:57:59 -07:00
CCControlExtension	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create	2012-06-14 17:36:31 +08:00
CCListView	issue #1324: Reverted old interfaces.	2012-06-14 17:18:05 +08:00
CCNotificationCenter	issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder.	2012-06-14 16:05:58 +08:00
CCTextureWatcher	issue #1324: Added create() for static member functions that new an autorelease object	2012-06-14 15:13:16 +08:00