diff options
author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-04-26 22:05:44 +0200 |
---|---|---|
committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-04-26 22:05:44 +0200 |
commit | cd61fb1b55cc0f7cc2dc206170b1d95381edad9d (patch) | |
tree | 51cbd0ae1410bb32d9f943097581c581e3e106fb /ui/jquery.effects.core.js | |
parent | f7d2fdbab8f6e0ea37fb02f9458489990305ff2f (diff) | |
parent | 325ee6e87133dd2a507c820dd3c356e3b897a3ec (diff) | |
download | jquery-ui-cd61fb1b55cc0f7cc2dc206170b1d95381edad9d.tar.gz jquery-ui-cd61fb1b55cc0f7cc2dc206170b1d95381edad9d.zip |
Merge branch 'master' into menubar
Conflicts:
ui/jquery.ui.menu.js
Diffstat (limited to 'ui/jquery.effects.core.js')
0 files changed, 0 insertions, 0 deletions