diff options
author | John Resig <jeresig@gmail.com> | 2011-04-12 16:05:40 -0400 |
---|---|---|
committer | John Resig <jeresig@gmail.com> | 2011-04-12 16:05:40 -0400 |
commit | 978c0655550ffbe32d977dbc997082e287c3a2b8 (patch) | |
tree | ad219d7cc4850f8def53f4d7aaed841c345447b9 /test/xhtml.php | |
parent | e7787cd09805583ff690d9c5e4b4c58a88393bf9 (diff) | |
parent | 82626799cacef94a1b35d0a0b4d284b38104704b (diff) | |
download | jquery-978c0655550ffbe32d977dbc997082e287c3a2b8.tar.gz jquery-978c0655550ffbe32d977dbc997082e287c3a2b8.zip |
Merge branch 'Sub_Naming' of https://github.com/timmywil/jquery into timmywil-Sub_Naming
Conflicts:
src/core.js
src/css.js
src/event.js
Diffstat (limited to 'test/xhtml.php')
0 files changed, 0 insertions, 0 deletions