Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 ... # Conflicts: # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters		2015-06-17 13:04:24 +08:00
..
Classes	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon	2015-06-15 16:13:36 +08:00
proj.android	modify android res copy	2015-06-15 09:55:10 +08:00
proj.android-studio	modify android res copy	2015-06-15 09:55:10 +08:00
proj.ios	Add js-tests	2015-04-16 18:07:35 +08:00
proj.linux	Add js-tests	2015-04-16 18:07:35 +08:00
proj.mac	Add js-tests	2015-04-16 18:07:35 +08:00
proj.win8.1-universal	added missing librecast	2015-06-15 20:06:54 -07:00
proj.win32	add win32 project resource copy	2015-06-15 09:55:05 +08:00
CMakeLists.txt	copy resources in linux	2015-05-26 16:34:04 +08:00