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
..
cpp-empty-test	added missing files for wp8	2014-06-23 08:35:39 -07:00
cpp-tests	call parent onExit method	2014-06-30 18:22:58 +08:00
game-controller-test	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630	2014-06-30 19:27:01 +08:00
lua-empty-test	add new line at the end of a file to *.mk	2014-06-19 20:43:27 +09:00
lua-tests	Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux	2014-06-27 17:58:59 +08:00