3 Commits

Author	SHA1	Message	Date
boyu0	4fda8a2635	closed #3988: add bug test	2014-02-12 15:57:02 +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
Ricardo Quesada	e77d22a58f	samples -> tests	2014-01-31 14:09:28 -08:00