yangxiao 8da7a4b2de merge cocos reslove conflict		2014-09-04 17:40:14 +08:00
..
2d	merge cocos reslove conflict	2014-09-04 17:40:14 +08:00
3d	merge cocos reslove conflict	2014-09-04 17:40:14 +08:00
audio	Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme	2014-08-29 12:55:14 -07:00
base	merge cocos reslove conflict	2014-09-04 17:40:14 +08:00
deprecated	Adds MARK: TODO: FIXME: in code	2014-08-29 12:54:24 -07:00
editor-support	Merge pull request #7942 from andyque/deleteRedundantCode	2014-09-04 13:45:12 +08:00
math	Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme	2014-08-29 12:55:14 -07:00
network	bugfix: condition variable sleep on unrelated mutex	2014-09-03 23:56:54 +08:00
physics	fix chipmunk	2014-08-30 21:09:28 +08:00
platform	Merge pull request #7943 from Dhilan007/v3	2014-09-04 13:43:39 +08:00
renderer	merge cocos reslove conflict	2014-09-04 17:40:14 +08:00
scripting/lua-bindings	Merge pull request #7940 from andyque/fixVs2013CompileError	2014-09-04 13:41:15 +08:00
storage/local-storage	Adjust android.mk for cocos2d and related module	2014-08-27 22:54:28 +08:00
ui	setPlaceholderFontSize fix	2014-09-03 23:38:44 +04:00
Android.mk	android works for trianglesCommand	2014-09-01 13:57:33 +08:00
CMakeLists.txt	fix linux and android compile error	2014-09-01 17:43:40 +08:00
cocos2d-prefix.pch	add cocos2d.h into pre-compiled header	2014-08-26 16:45:24 +08:00
cocos2d.cpp	update version	2014-08-22 11:48:14 +08:00
cocos2d.h	add trianglesCommand head file to cocos2d	2014-09-04 11:20:43 +08:00