Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into issue2261_LoaderBug

ShengxiangChen · ShengxiangChen · commit cb31943292c5 · 2014-02-17T15:12:18.000+08:00
Conflicts:
	cocos2d/core/CCLoader.js
diff --git a/cocos2d/core/CCLoader.js b/cocos2d/core/CCLoader.js
@@ -252,7 +252,6 @@ cc.Loader = cc.Class.extend(/** @lends cc.Loader# */{
         }
         else {
             var ext = path.substring(path.lastIndexOf(".") + 1, path.length);
-
             var index = ext.indexOf("?");
             if (index > 0) ext = ext.substring(0, index);
 

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,6 @@ cc.Loader = cc.Class.extend(/** @lends cc.Loader# */{`
`252`	`252`	`}`
`253`	`253`	`else {`
`254`	`254`	`var ext = path.substring(path.lastIndexOf(".") + 1, path.length);`
`255`		`-`
`256`	`255`	`var index = ext.indexOf("?");`
`257`	`256`	`if (index > 0) ext = ext.substring(0, index);`
`258`	`257`