4 Commits

Author	SHA1	Message	Date
James Chen	99c20c4e30	Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 ... Conflicts: tests/test-javascript/tests	2014-02-10 11:38:56 +08:00
Pisces000221	03be459376	Update LabelTestNew.lua	2014-02-08 17:17:35 +08:00
Pisces000221	cef84f05af	Add LabelTTFCJKWrappingTest	2014-02-08 17:16:59 +08:00
Ricardo Quesada	e77d22a58f	samples -> tests	2014-01-31 14:09:28 -08:00