WenhaiLin f95245312a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0		2015-06-23 17:08:25 +08:00
..
project	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +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	Fixbug: LabelTestNew New Label + CharMap's effect is wrong.	2015-06-23 16:02:38 +08:00
.cocos-project.json	Solve the error when build tests projects with cocos command on win32.	2015-06-19 18:32:32 +08:00