James Chen 8f6c8e202e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests ... Conflicts: samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp		2012-11-20 16:35:42 +08:00
..
CCLabelAtlas.cpp	issue #1564: Return a new object instead of 'const reference' for some get methods.	2012-11-20 16:34:55 +08:00
CCLabelAtlas.h	update copyright to 2012, update cocos2d version to 2.0.3	2012-09-24 21:22:20 +08:00
CCLabelBMFont.cpp	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests	2012-11-20 16:35:42 +08:00
CCLabelBMFont.h	issue #1555: update to v2.1 beta3	2012-11-15 17:16:51 +08:00
CCLabelTTF.cpp	issue #1555:update to v2.1 beta3	2012-11-14 18:05:15 +08:00
CCLabelTTF.h	issue #1555:update to v2.1 beta3	2012-11-14 18:05:15 +08:00