2 Commits

Author	SHA1	Message	Date
Ricardo Quesada	e0523b3438	Merge branch 'developNewLabelForRiq' into label_merge ... Conflicts: cocos2dx/textures/CCTexture2D.h samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp scripting/javascript/bindings/generated tools/bindings-generator	2013-07-24 15:15:08 -07:00
carlo morgantini	97363c9382	some more cleanup and refactory for the new Label stuff	2013-07-24 10:22:46 -07:00