minggo 213f2f5a6c Merge pull request #7702 from super626/v3_merge ... Camera and Camera test		2014-08-08 15:56:38 +08:00
..
cpp-template-default	WP8 compile fix	2014-08-07 11:56:28 +08:00
lua-template-default	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-07 14:02:50 +08:00
lua-template-runtime	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-07 14:02:50 +08:00
cocos2dx_files.json	Merge pull request #7702 from super626/v3_merge	2014-08-08 15:56:38 +08:00