yangxiao c3593c9d64 merge cocos		2015-06-23 18:29:39 +08:00
..
cpp-empty-test	Merge pull request #12460 from MSOpenTech/v3-winrt-readme	2015-06-22 13:05:51 +08:00
cpp-tests	merge cocos	2015-06-23 18:29:39 +08:00
game-controller-test	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
js-tests	Merge pull request #12487 from pandamicro/v3	2015-06-23 16:59:08 +08:00
lua-empty-test	Solve the error when build tests projects with cocos command on win32.	2015-06-19 18:32:32 +08:00
lua-game-controller-test	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
lua-tests	Fixbug: LabelTestNew New Label + CharMap's effect is wrong.	2015-06-23 16:02:38 +08:00