minggo 007e42faa0 Merge pull request #7616 from gin0606/fix_videoPlayer_ios_memory_leak ... Fix iOS VideoPlayer memory leak.		2014-08-05 09:30:52 +08:00
..
2d	Merge branch 'v3' into v3_pr	2014-08-01 15:11:34 +08:00
3d	Merge pull request #7526 from chenguangqi/v3	2014-07-21 13:54:31 +08:00
audio	change CocosDenshion to libcocosdenshion	2014-07-28 21:35:16 +08:00
base	Update ccUtils.h	2014-08-04 15:21:10 +08:00
deprecated	Merge branch 'v3' into v3_dll	2014-07-17 14:12:10 +08:00
editor-support	remove some update condition of Frame::apply function	2014-08-01 14:40:42 +08:00
math	add CC_DLL for functions	2014-07-15 11:18:05 +08:00
network	change libnetwork and libSpine	2014-07-29 09:31:52 +08:00
physics	Mac dylib version works now	2014-07-17 20:58:50 +08:00
platform	GLView Hook	2014-07-31 00:53:04 +08:00
renderer	Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha()	2014-07-28 10:38:22 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-08-01 07:53:19 +00:00
storage	remove unused windows localstorage project file	2014-07-29 15:23:07 +08:00
ui	Merge pull request #7616 from gin0606/fix_videoPlayer_ios_memory_leak	2014-08-05 09:30:52 +08:00
Android.mk	Merge branch 'v3' into v3_pr	2014-08-01 15:11:34 +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' into v3_pr	2014-08-01 15:11:34 +08:00