55 Commits

Author	SHA1	Message	Date
Dhilan007	83f4e536c5	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630 ... Conflicts: tests/game-controller-test/proj.android/project.properties	2014-06-30 19:27:01 +08:00
Dhilan007	9bf36a1045	update test case.	2014-06-30 18:43:09 +08:00
minggo	3b13855374	fix compiling error on iOS	2014-06-30 17:20:13 +08:00
minggo	c1e56e62c1	fix compiling error	2014-06-30 15:51:35 +08:00
Dhilan007	a63216d97b	issue #4895:Add test case	2014-06-30 03:25:49 +08:00