samuele3hu 55e77d8fd2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix		2014-07-15 11:34:57 +08:00
..
project	Remove glView setting form cpp to lua script	2014-07-11 15:34:56 +08:00
res/cocosbuilderRes	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
src	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix	2014-07-15 11:34:57 +08:00
.cocos-project.json	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00