minggo f928046f50 Merge pull request #8580 from Dhilan007/v3-labelfix ... issue #8492:fix endless loop when dimensions that are not enough to fit one character		2014-10-09 17:05:39 +08:00
..
Classes	Merge pull request #8580 from Dhilan007/v3-labelfix	2014-10-09 17:05:39 +08:00
Resources	Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements	2014-09-30 17:09:02 +08:00
proj.android	merge cocos	2014-09-26 15:14:57 +08:00
proj.ios	precompiled headers improvements for iOS & Mac	2014-09-23 23:19:25 +04:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	precompiled headers improvements for iOS & Mac	2014-09-23 23:19:25 +04:00
proj.win32	fix compile error on win32	2014-09-30 14:40:24 +08:00
proj.wp8-xaml	wp8: use CC_STATIC because libs are static	2014-10-09 06:33:46 +01:00
.cocos-project.json	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
CMakeLists.txt	merge cocos resolve conflict	2014-09-30 08:32:37 +08:00