Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	preloadjs/preloadjs.d.ts
	soundjs/soundjs.d.ts
This commit is contained in:
s_kimura
2013-11-27 21:58:28 +09:00
28 changed files with 113 additions and 107 deletions
+1 -1
View File
@@ -71,7 +71,7 @@ declare module createjs {
loadManifest(manifest: Object[], loadNow?: boolean, basePath?: string): void;
loadManifest(manifest: string[], loadNow?: boolean, basePath?: string): void;
remove(idsOrUrls: string): void;
remove(idsOrUrls: string[]): void;
remove(idsOrUrls: any[]): void;
removeAll(): void;
reset(): void;
setMaxConnections(value: number): void;