diff options
| author | jeresig <jeresig@gmail.com> | 2011-04-10 15:49:17 -0400 |
|---|---|---|
| committer | jeresig <jeresig@gmail.com> | 2011-04-10 15:49:17 -0400 |
| commit | 7fb95ebe8f1b79220947d127a5d2b8bf56143622 (patch) | |
| tree | 447e0ab66d73af10f902fa14766d388514affc31 /src/core.js | |
| parent | 9ed5c774e4222a4f100b5a06e5f90327aa2d4b18 (diff) | |
| parent | b92d2f0bc96d65c83252fa3033c37b92eb32d442 (diff) | |
| download | jquery-7fb95ebe8f1b79220947d127a5d2b8bf56143622.tar.gz jquery-7fb95ebe8f1b79220947d127a5d2b8bf56143622.zip | |
Merge branch 'attrhooks.1.6'
Conflicts:
src/core.js
src/support.js
Diffstat (limited to 'src/core.js')
| -rw-r--r-- | src/core.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core.js b/src/core.js index b05d4138c..8f24000fa 100644 --- a/src/core.js +++ b/src/core.js @@ -893,4 +893,3 @@ function doScrollCheck() { return jQuery; })(); - |