2 Commits

Author	SHA1	Message	Date
James Chen	151b38922e	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1724-hellojs ... Conflicts: template/multi-platform-js/proj.win32/HelloJavascript.vcxproj	2013-02-18 16:32:54 +08:00
James Chen	1d9e9e48bc	fixed #1724: Moved HelloJavascript to template folder and renamed it with "multi-platform-is".	2013-02-18 16:25:21 +08:00