yangxiao 000e34c6d0 merge cocos		2015-03-26 12:50:18 +08:00
..
project	Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]	2015-03-14 19:33:15 +01: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 cocos	2015-03-26 12:50:18 +08:00
.cocos-project.json	Solve the error when building android for sample projects of engine.	2014-11-18 18:39:53 +08:00