andyque 3d97ddc739 Merge branch 'v3' into addWebView ... Conflicts: cocos/ui/Android.mk		2014-08-27 14:08:16 +08:00
..
Classes	improve test case and make program more robust	2014-08-27 08:02:22 +08:00
Resources	Merge branch 'v3' into addWebView	2014-08-26 22:11:35 +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	Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.	2014-08-27 10:18:44 +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	finish android version	2014-08-26 16:53:37 +08:00
CMakeLists.txt	fix compiling error of cpp-tests on linux	2014-08-24 19:12:36 -07:00