songmiao 08a4ebba06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h		2014-08-15 17:43:04 +08:00
..
Classes	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard	2014-08-15 17:43:04 +08:00
Resources	fix skinned outline effect	2014-08-14 10:44:03 +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	windows work	2014-08-08 18:25:36 +08:00
proj.wp8-xaml	fix windows compile error	2014-07-29 17:51:34 +08:00
.cocos-project.json	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
Android.mk	1. move drawnode3d to Sprite3DTest	2014-08-08 17:54:39 +08:00
CMakeLists.txt	fix linux	2014-08-09 09:27:48 +08:00