chuanweizhang2013 7f75b58acf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime ... Conflicts: templates/lua-template-runtime/cocos-project-template.json		2014-06-23 17:30:33 +08:00
..
2d	added missing files and tests that broke wp8 build	2014-06-20 09:07:51 -07:00
3d	Merge pull request #7115 from minggo/windows-fix	2014-06-18 14:14:39 +08:00
audio	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-06-20 10:51:13 +08:00
base	CCLOGINFO compilation fix	2014-06-19 20:59:08 +04:00
deprecated	CCLOGINFO compilation fix	2014-06-19 20:59:08 +04:00
editor-support	added missing files and tests that broke wp8 build	2014-06-20 09:07:51 -07:00
math	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
network	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-06-20 10:51:13 +08:00
physics	closed #4944: fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback.	2014-05-21 16:07:49 +08:00
platform	updated wp8 precompiled shaders	2014-06-20 09:07:29 -07:00
renderer	Merge pull request #7139 from zawasp/uniform_struct	2014-06-19 20:55:37 +08:00
scripting/lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime	2014-06-23 17:30:33 +08:00
storage	Optimize the win32 projects configuration.	2014-06-20 10:50:43 +08:00
ui	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-06-20 10:51:13 +08:00
Android.mk	change speed	2014-06-17 13:45:58 +08:00
CMakeLists.txt	Squashed commit of the following:	2014-05-18 14:49:16 -07:00
cocos2d-prefix.pch	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
cocos2d.cpp	[ci skip]	2014-06-17 18:42:10 +08:00
cocos2d.h	change ActionTimeline to cocostudio ActionTimeline folder	2014-06-13 18:51:32 +08:00