samuele3hu 70cba1f64a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module ... Conflicts: cocos/Android.mk		2014-08-22 14:01:17 +08:00
..
Classes	Merge pull request #7840 from minggo/fix-warning	2014-08-22 13:41:31 +08:00
Resources	fix skinned outline effect	2014-08-14 10:44:03 +08:00
proj.android	use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES	2014-08-19 15:29:40 +08:00
proj.ios	GLView Hook	2014-07-31 00:53:04 +08:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	Mac fonts tests	2014-07-24 12:27:17 +04:00
proj.win32	Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform	2014-08-22 13:49:21 +08:00
proj.wp8-xaml	fix windows & win8 & wp8 compile error	2014-08-20 12:02:12 +08:00
.cocos-project.json	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
Android.mk	Update android.mk for related cpp test cases	2014-08-22 13:49:54 +08:00
CMakeLists.txt	Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project	2014-08-17 23:45:56 +08:00