Merge branch 'fix8033' of https://github.com/SlexAxton/jquery into SlexAxton-fix8033

This commit is contained in:
jeresig 2011-02-14 12:35:27 -05:00
commit 3ad8dd242a
9 changed files with 15 additions and 14 deletions

View file

@ -1076,6 +1076,6 @@ function doScrollCheck() {
}
// Expose jQuery to the global object
return (window.jQuery = window.$ = jQuery);
return jQuery;
})();

View file

@ -1 +1,2 @@
window.jQuery = window.$ = jQuery;
})(window);