minggo 8db7caff2a Merge pull request #7050 from gin0606/videoPlayerIssue ... Fix crash when try to remove videoView(STATE_PLAYBACK_COMPLETED) in android		2014-06-25 17:56:03 +08:00
..
2d	Merge pull request #7186 from billtt/v3_fixNodeSetScale	2014-06-25 14:41:15 +08:00
3d	fix cannot compile in windows	2014-06-18 14:35:43 +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	fixed #4693: override addChild by name	2014-06-25 11:27:48 +08: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	Merge pull request #7050 from gin0606/videoPlayerIssue	2014-06-25 17:56:03 +08:00
renderer	- Due to the fact that map::insert doesn't allow to insert an element by existing key, I suggest to use operator []. It allows to change the	2014-06-22 20:53:01 +03:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-06-25 09:36:50 +00:00
storage	Optimize the win32 projects configuration.	2014-06-20 10:50:43 +08:00
ui	fix ListView addChild problem	2014-06-25 16:17:16 +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