Dhilan007 fc27c5e32a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-09-10 14:35:33 +08:00
..
2d	Merge branch 'v3' into addChipmunkStaticLib	2014-09-10 10:00:15 +08:00
3d	Merge pull request #7978 from super626/v3	2014-09-10 14:06:47 +08:00
audio	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909	2014-09-10 14:35:33 +08:00
base	compiles and runs on linux	2014-09-09 17:41:49 -07:00
deprecated	Adds MARK: TODO: FIXME: in code	2014-08-29 12:54:24 -07:00
editor-support	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
math	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
network	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
physics	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
platform	Android properties back to 10	2014-09-09 18:46:47 -07:00
renderer	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-09-10 01:52:43 +00:00
storage/local-storage	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
ui	compiles on wp8	2014-09-09 18:22:11 -07:00
Android.mk	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909	2014-09-10 14:35:33 +08:00
CMakeLists.txt	modify linux cmakelist	2014-09-09 22:59:55 -07:00
cocos2d-prefix.pch	add cocos2d.h into pre-compiled header	2014-08-26 16:45:24 +08:00
cocos2d.cpp	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
cocos2d.h	Compiles in Win32	2014-09-09 18:07:24 -07:00