aboutsummaryrefslogtreecommitdiff
path: root/src/library_browser.js
diff options
context:
space:
mode:
authormax99x <max99x@gmail.com>2011-07-17 13:12:42 +0300
committermax99x <max99x@gmail.com>2011-07-17 13:12:42 +0300
commit61c5b7568e542d8c353a1b78be2a151f93b55acb (patch)
tree47760a69a78b998f9d15b2b3ccd46427f493fa33 /src/library_browser.js
parent26031d46a779fcfe44e4cd6d2476eee99b0c621b (diff)
parentab56efe76e94a0508d3983e9430e2aa18b1e2667 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/library_browser.js')
-rw-r--r--src/library_browser.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library_browser.js b/src/library_browser.js
index d24854f9..c4d1d768 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -1,6 +1,6 @@
// Utilities for browser environments
-mergeInto(Library, {
+mergeInto(LibraryManager.library, {
$Browser: {
// Given binary data for an image, in a format like PNG or JPG, we convert it
// to flat pixel data. We do so using the browser's native code.