pandamicro e2568b3a6f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory ... Conflicts: tests/js-memory-gc-tests/src/tests-main.js		2016-01-28 01:12:49 +08:00
..
cpp-empty-test	updated winrt temporary app certificates expiration dates	2015-10-20 07:39:42 -07:00
cpp-tests	fix win32 compile error	2016-01-26 09:52:53 +08:00
game-controller-test	adds tvOS support	2015-12-28 15:59:36 -08:00
js-memory-gc-tests	Improve test cases	2016-01-26 19:34:01 +08:00
js-tests	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory	2016-01-28 01:12:49 +08:00
lua-empty-test	Fix compile error	2015-12-04 17:22:41 +08:00
lua-game-controller-test	[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0	2015-08-18 22:37:00 +08:00
lua-tests	fix lua deprecated function bindings	2016-01-25 14:48:17 +08:00
performance-tests	Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist	2015-10-27 17:28:22 +08:00