Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/label_nodes
History
James Chen 833b5b1be8 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 
Conflicts:
	cocos2dx/base_nodes/CCNode.cpp
	cocos2dx/sprite_nodes/CCSprite.cpp
	samples/TestCpp/Classes/TouchesTest/Ball.cpp
	samples/TestCpp/Classes/VisibleRect.cpp
	samples/TestCpp/Classes/VisibleRect.h
 		2012-11-12 10:20:04 +08:00
..
CCLabelAtlas.cpp Fixing LabelAtlas to read texture relative to path of plist file 2012-10-11 18:44:46 -07: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/mrmop/cocos2d-x into iss1557-marmalade 2012-11-12 10:20:04 +08:00
CCLabelBMFont.h issue #1526: Moved implementations of static functions in CCActionEase.h, CCLabelBMFont.h to CCActionEase.cpp, CCLabelBMFont.cpp. 2012-11-02 10:06:48 +08:00
CCLabelTTF.cpp update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00
CCLabelTTF.h update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00