2 Commits

Author	SHA1	Message	Date
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
carlo morgantini	002ae77698	new dynamic TTF label stuff	2013-07-11 14:41:03 -07:00