CaiWenzhi 0a46b3c8d2 Merge branch 'v3' into v3_nutty_fixedreaderbug ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2014-05-08 15:56:34 +08:00
..
2d	Merge pull request #6610 from zawasp/vs2013project	2014-05-08 15:40:02 +08:00
audio	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).	2014-05-07 17:41:04 +03:00
base	closed #3861, fixed some typo and indent problem	2014-05-06 12:04:52 +08:00
deprecated	math fixes	2014-05-05 17:10:41 -07:00
editor-support	Merge branch 'v3' into v3_nutty_fixedreaderbug	2014-05-08 15:56:34 +08:00
math	Merge branch 'v3' into v3.1_unify_ZERO_ONE	2014-05-05 18:10:13 -07:00
network	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).	2014-05-07 17:41:04 +03:00
physics	rolling back physics in layer	2014-05-01 16:42:35 -07:00
renderer	linux cmake improvements	2014-05-01 13:01:51 -07:00
scripting/lua-bindings	Merge pull request #6610 from zawasp/vs2013project	2014-05-08 15:40:02 +08:00
storage	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).	2014-05-07 17:41:04 +03:00
ui	Merge pull request #6610 from zawasp/vs2013project	2014-05-08 15:40:02 +08:00
Android.mk	Merge remote-tracking branch 'upstream/v3' into focus3861	2014-05-07 11:42:09 +08:00
CMakeLists.txt	linux cmake improvements	2014-05-01 13:01:51 -07:00
cocos2d.cpp	Squashed commit of the following:	2014-04-26 10:11:22 -07:00
cocos2d.h	issue #4861. add a horizontal focus test	2014-05-05 11:37:39 +08:00