Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Cpp/TestCpp/Classes/LabelTest
History
Ricardo Quesada 88928fff99 Merge branch 'developNewLabelMerge' into merge_new_label 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/textures/CCTexture2D.h
	samples/Javascript/Shared
 		2013-07-19 16:04:23 -07:00
..
LabelTest.cpp Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
LabelTest.h Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00