samuele3hu 890bc20475 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix		2014-06-06 11:44:23 +08:00
..
cpp-empty-test	Support Fast App Resume.	2014-06-04 11:19:53 +08:00
cpp-tests	Merge pull request #6979 from visiblelight/TextureOptimize	2014-06-06 11:38:49 +08:00
lua-empty-test	Update lua-template and lua-empty-test for replacing bgMusicPath	2014-05-28 10:27:03 +08:00
lua-tests	Update control.lua for lua-tests	2014-06-06 11:42:18 +08:00