Skip to content

/jquery

Permalink
Browse files

Merge branch 'attrhooks.1.6' 

Conflicts:
	src/core.js
	src/support.js
  • Loading branch information...
@jeresig
jeresig committed Apr 10, 2011
2 parents 9ed5c77 + b92d2f0 commit 7fb95ebe8f1b79220947d127a5d2b8bf56143622
Unified Split
Showing with 398 additions and 198 deletions.
  1. +246 −104 src/attributes.js
  2. +0 −1 src/core.js
  3. +3 −2 src/manipulation.js
  4. +3 −0 src/support.js
  5. +4 −0 test/index.html
  6. +138 −89 test/unit/attributes.js
  7. +4 −2 test/unit/manipulation.js

0 comments on commit 7fb95eb

Please sign in to comment.
You can’t perform that action at this time.