diff options
| author | jeresig <jeresig@gmail.com> | 2011-04-10 15:41:51 -0400 |
|---|---|---|
| committer | jeresig <jeresig@gmail.com> | 2011-04-10 15:41:51 -0400 |
| commit | b92d2f0bc96d65c83252fa3033c37b92eb32d442 (patch) | |
| tree | ac8545d23de62865406703eb3eb7ff3bd7401d75 /src/core.js | |
| parent | d4e4414451e15d23d7174e8eeddaa952ed0e4d73 (diff) | |
| parent | 3a1b4661f5b8249ce7a741084824ec5445c75719 (diff) | |
| download | jquery-b92d2f0bc96d65c83252fa3033c37b92eb32d442.tar.gz jquery-b92d2f0bc96d65c83252fa3033c37b92eb32d442.zip | |
Merge branch 'attrhooks.1.6v2' of https://github.com/timmywil/jquery into timmywil-attrhooks.1.6v2
Conflicts:
src/attributes.js
Diffstat (limited to 'src/core.js')
| -rw-r--r-- | src/core.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core.js b/src/core.js index 9312ee288..6b00a0151 100644 --- a/src/core.js +++ b/src/core.js @@ -894,4 +894,4 @@ function doScrollCheck() { // Expose jQuery to the global object return jQuery; -})(); +})();
\ No newline at end of file |