kaile.yin 400cceeae8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame		2014-10-20 10:18:29 +08:00
..
2d	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-10-17 18:08:55 +08:00
3d	Merge pull request #8768 from Dhilan007/v3-33rc	2014-10-17 14:09:49 +08:00
audio	updated for Windows 8.1	2014-10-14 14:13:14 -07:00
base	Merge pull request #8717 from MSOpenTech/wp8-dll	2014-10-16 09:33:43 +08:00
deprecated	Multi platform cmake support	2014-10-03 23:21:45 +01:00
editor-support	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame	2014-10-20 10:18:29 +08:00
math	Multi platform cmake support	2014-10-03 23:21:45 +01:00
network	Improve Android.mk	2014-10-17 10:13:33 +08:00
physics	try to fix ubuntu 12.04 compile error	2014-10-10 17:27:15 +08:00
platform	Merge pull request #8768 from Dhilan007/v3-33rc	2014-10-17 14:09:49 +08:00
renderer	Merge pull request #8667 from super626/v3	2014-10-17 13:40:53 +08:00
scripting/lua-bindings	Merge pull request #8847 from samuele3hu/v3_new_spine	2014-10-19 20:10:12 +08:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #8823 from super626/v3	2014-10-18 15:11:45 +08:00
Android.mk	Improve Android.mk	2014-10-17 10:13:33 +08:00
CMakeLists.txt	Update CMakeLists.txt	2014-10-15 17:37:58 +03:00
cocos2d.cpp	[ci skip]update version	2014-10-16 15:41:43 +08:00
cocos2d.h	Merge pull request #8717 from MSOpenTech/wp8-dll	2014-10-16 09:33:43 +08:00