8 Commits

Author	SHA1	Message	Date
samuele3hu	5acb556c74	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger	2014-02-18 13:46:21 +08:00
samuele3hu	8cb424b535	close #3593:Add more test cases about SceneReader of cocoStudio	2014-02-18 13:44:11 +08:00
samuele3hu	3f8bc8cc43	issue #3708:Remove the useless test case	2014-02-17 10:24:58 +08:00
samuele3hu	3d0fabe08c	issue #3708:Performance Test: data structure conversion in lua binding	2014-02-12 18:19:06 +08:00
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