axmol/tests/cpp-tests
samuele3hu cf0aa36c15 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
	cocos/network/CMakeLists.txt
	cocos/storage/CMakeLists.txt
2014-08-07 14:02:50 +08:00
..
Classes Merge pull request from rny/SpriteFrameCache 2014-08-07 10:20:36 +08:00
Resources Merge branch 'newcode' into v3 2014-08-04 15:41:21 +08:00
proj.android add regular support in Node::enumerateChildren() 2014-07-02 17:07:36 +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 remove CC_CONSTUCTOR_ACCESS fow win32 release 2014-07-30 16:39:21 +08:00
proj.wp8-xaml fix windows compile error 2014-07-29 17:51:34 +08:00
.cocos-project.json issue : Re-added deleted source files. 2014-05-04 14:37:55 +08:00
Android.mk fix android and linux compile error 2014-07-29 16:24:27 +08:00
CMakeLists.txt extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt 2014-08-07 13:53:13 +08:00