diff options
author | gnarf <gnarf@gnarf.net> | 2011-05-10 16:16:34 -0500 |
---|---|---|
committer | gnarf <gnarf@gnarf.net> | 2011-05-10 16:16:34 -0500 |
commit | 27a7deebf299e1673e8b452476be02e486bba2c6 (patch) | |
tree | 79521a78ab770ebd7ee167575b680f14d3ed4089 /ui/jquery.effects.shake.js | |
parent | 4dcfeee8d54d81db4d5af8b2fd189b799cd9561e (diff) | |
parent | 85ac420a1e4281ee7f361e847d3cad72fa58525e (diff) | |
download | jquery-ui-27a7deebf299e1673e8b452476be02e486bba2c6.tar.gz jquery-ui-27a7deebf299e1673e8b452476be02e486bba2c6.zip |
Merge branch 'master' into effects-unit
Conflicts:
ui/jquery.effects.pulsate.js
Diffstat (limited to 'ui/jquery.effects.shake.js')
0 files changed, 0 insertions, 0 deletions