minggo 45c4c16f93 Merge pull request #10010 from andyque/fixErrorFontName ... fix font name typo in tests		2015-01-15 10:24:02 +08:00
..
project	Add CC_DEPRECATED_ATTRIBUTE flag	2015-01-14 15:09:37 +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 pull request #10010 from andyque/fixErrorFontName	2015-01-15 10:24:02 +08:00
.cocos-project.json	Solve the error when building android for sample projects of engine.	2014-11-18 18:39:53 +08:00