James Chen 1eadcd8b38 fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate ... Conflicts: cocos2dx/proj.emscripten/cocos2dx.mk		2013-06-19 13:03:51 +08:00
..
Cpp	fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate	2013-06-19 13:03:51 +08:00
Javascript	issue #2284: fix bugs after merging master	2013-06-14 14:34:50 +08:00
Lua	issue #2300: copy --> clone for luabinding.	2013-06-19 12:08:26 +08:00