WuHao c2cefadb6f Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6		2015-04-27 10:44:56 +08:00
..
2d	Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6	2015-04-27 10:44:56 +08:00
3d	Merge pull request #11572 from super626/v3	2015-04-24 16:42:33 +08:00
audio	removed WP8 project files	2015-04-15 07:13:54 -07:00
base	Merge pull request #11489 from dumganhar/clean-order	2015-04-20 10:47:37 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	Merge pull request #11536 from xiaofeng11/v3	2015-04-22 10:25:49 +08:00
math	Optimize Vec2	2015-04-19 20:40:52 +03:00
network	[ci skip]Update comments.	2015-03-27 18:26:14 +08:00
physics	Optimize Vec2	2015-04-19 20:40:52 +03:00
platform	Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3	2015-04-24 18:29:23 +08:00
renderer	fix	2015-04-24 11:40:15 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2015-04-21 10:29:17 +00:00
storage	[ci skip]Update comments	2015-03-24 14:12:58 +08:00
ui	remove uishader settings	2015-04-20 17:04:49 +08:00
Android.mk	Add the PolySprite support and adjust the project setting on the different platform	2015-04-23 00:51:47 +08:00
CMakeLists.txt	fix typo	2015-03-05 17:05:08 +08:00
cocos2d.cpp	[ci skip] update version	2015-04-14 10:46:20 +08:00
cocos2d.h	[ci skip] update version	2015-04-07 10:35:49 +08:00