Huabing.Xu 47471e202d Merge branch 'v3' into fast_tmx ... Conflicts: cocos/2d/cocos2d.vcxproj.filters		2014-06-29 20:23:43 +08:00
..
Classes	Merge branch 'v3' into fast_tmx	2014-06-29 20:23:43 +08:00
Resources	Animate3D transition	2014-06-27 17:02:08 +08:00
proj.android	add new line at the end of a file to *.mk	2014-06-19 20:43:27 +09:00
proj.ios	Fixes compiler warnings for mac and ios	2014-05-22 16:34:16 -03:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
proj.win32	windows works for fast tmx	2014-06-27 16:56:26 +08:00
proj.wp8-xaml	added missing files and tests that broke wp8 build	2014-06-20 09:07:51 -07:00
.cocos-project.json	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
Android.mk	Merge branch 'v3' into fast_tmx	2014-06-25 10:10:08 +08:00
CMakeLists.txt	Merge branch 'v3' into fast_tmx	2014-06-25 10:10:08 +08:00