samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module		2014-08-25 11:52:52 +08:00
..
Classes	Merge pull request #7843 from huangshiwu/v3_glviewattrs	2014-08-25 09:46:19 +08:00
Resources	engine adjust	2014-08-22 13:25:26 +08:00
proj.android	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
proj.ios	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +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	fix compiling error of cpp-tests on linux	2014-08-24 19:12:36 -07:00