boyu0 76e05ee802 Merge https://github.com/cocos2d/cocos2d-x into 2345		2013-07-18 17:47:43 +08:00
..
animation	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
datas	issue #2129:remove prefix of types in ccTypes.h	2013-07-05 16:49:22 +08:00
display	Some more changes to make the code more c++ friendly:	2013-07-16 18:16:04 -07:00
external_tool	refactor CCImage and CCTexture2D	2013-07-17 17:12:04 +08:00
physics	issue #2387: Using static_cast instead of C style cast in iteration of CCArray.	2013-07-09 14:29:51 +08:00
utils	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
CCArmature.cpp	Some more changes to make the code more c++ friendly:	2013-07-16 18:16:04 -07:00
CCArmature.h	Some more changes to make the code more c++ friendly:	2013-07-16 18:16:04 -07:00
CCBone.cpp	issue #2387: Using static_cast instead of C style cast in iteration of CCArray.	2013-07-09 14:29:51 +08:00
CCBone.h	issue #2129:remove prefix of types in ccTypes.h	2013-07-05 16:49:22 +08:00