minggo 7308668e63 Merge pull request #7411 from minggo/warning-fix ... fix warnings		2014-07-11 17:42:12 +08:00
..
2d	Merge pull request #7363 from Dhilan007/v3-event-clear	2014-07-11 13:36:52 +08:00
3d	Merge pull request #7363 from Dhilan007/v3-event-clear	2014-07-11 13:36:52 +08:00
audio	fix compiling warnings	2014-07-03 11:43:56 +08:00
base	fix warnings	2014-07-11 17:39:56 +08:00
deprecated	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
editor-support	fix text reader binray version setFontName	2014-07-11 13:58:08 +08:00
math	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
network	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
physics	fix transform for physics.	2014-06-27 17:30:21 +08:00
platform	fix warnings	2014-07-11 17:39:56 +08:00
renderer	Merge pull request #7363 from Dhilan007/v3-event-clear	2014-07-11 13:36:52 +08:00
scripting/lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix	2014-07-11 16:44:59 +08:00
storage	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
ui	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
Android.mk	Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor	2014-07-04 17:03:48 +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: update version]	2014-07-07 17:24:14 +08:00
cocos2d.h	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix	2014-07-11 16:44:59 +08:00