minggo a59a86df0a Merge pull request #7439 from boyu0/merge_arm64_lib_to_fat_lib ... merge iOS arm64 libs to fat libs, change the project setting.		2014-07-15 16:57:10 +08:00
..
2d	disable warn on zero-sized structures.	2014-07-14 17:53:55 +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	Merge pull request #7412 from Dhilan007/v3-320final	2014-07-11 18:50:25 +08:00
deprecated	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
editor-support	Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into ArmatureTrans	2014-07-15 11:32:12 +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	fixed crash cause by incorrect font name.	2014-07-14 10:01:29 +08:00
renderer	Fix compile errors on WP8	2014-07-11 15:10:19 +08:00
scripting/lua-bindings	Merge pull request #7439 from boyu0/merge_arm64_lib_to_fat_lib	2014-07-15 16:57:10 +08:00
storage	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
ui	update UI module code comments	2014-07-15 15:56:07 +08:00
Android.mk	disable warn on zero-sized structures.	2014-07-14 17:53:55 +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-07-15 15:11:17 +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