James Chen e3ed28a8fb issue #2129: no need to write namespace since we are using *using namespace cocos2d::extension::armature;*.		2013-06-20 14:02:14 +08:00
..
Cpp	issue #2129: no need to write namespace since we are using *using namespace cocos2d::extension::armature;*.	2013-06-20 14:02:14 +08:00
Javascript	issue #2284: fix bugs after merging master	2013-06-14 14:34:50 +08:00
Lua	issue #2277: Delete some conflict file and resolve some error	2013-06-20 11:28:16 +08:00