Skip to content

Commit b7f7567

Browse files
author
Lanny McNie
committed
Merge branch 'GMC-0.6.2'
2 parents fc1d351 + a834f77 commit b7f7567

22 files changed

+795
-603
lines changed

VERSIONS.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Version NEXT [not yet released]
22
****************************************************************************************************
3+
4+
5+
Version 0.6.2 [November 26, 2015]
6+
****************************************************************************************************
37
- Fixed SpriteSheetLoader's JSONP loading
48
- Changed LoadQueue Array checks from instanceof to Array.isArray()
59
- Fixed using XHR to load sounds and video

_assets/libs/easeljs-NEXT.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_assets/libs/soundjs-NEXT.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_assets/libs/tweenjs-NEXT.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "PreloadJS",
3-
"version": "0.6.1",
3+
"version": "0.6.2",
44
"homepage": "https://github.com/CreateJS/PreloadJS",
55
"authors": [
66
"gskinner",
77
"lannymcnie",
88
"wdamien"
99
],
1010
"description": "PreloadJS makes preloading assets & getting aggregate progress events easier in JavaScript. It uses XHR2 when available, and falls back to tag-based loading when not. Part of the CreateJS suite of libraries.",
11-
"main": "lib/preloadjs-0.6.1.combined.js",
11+
"main": "lib/preloadjs-0.6.2.combined.js",
1212
"keywords": [
1313
"preload",
1414
"xhr",

build/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"../src/preloadjs/version.js",
44
"../src/createjs/utils/extend.js",
55
"../src/createjs/utils/promote.js",
6-
"../src/createjs/utils/indexOf.js",
76
"../src/createjs/utils/proxy.js",
7+
"../src/createjs/utils/indexOf.js",
88
"../src/createjs/events/Event.js",
99
"../src/createjs/events/ErrorEvent.js",
1010
"../src/createjs/events/EventDispatcher.js",

build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "PreloadJS",
3-
"version": "0.6.1",
3+
"version": "0.6.2",
44
"description": "PreloadJS Docs",
55
"url": "http://www.createjs.com/preloadjs",
66
"logo": "assets/docs-icon-PreloadJS.png",

docs/PreloadJS_docs-0.6.1.zip

-724 KB
Binary file not shown.

docs/PreloadJS_docs-0.6.2.zip

743 KB
Binary file not shown.

docs/preloadjs_docs-NEXT.zip

1.29 KB
Binary file not shown.

0 commit comments

Comments
 (0)