From: Scott González Date: Mon, 25 Jul 2011 15:53:14 +0000 (-0400) Subject: Merge branch 'master' into core-1.6.1 X-Git-Tag: 1.9m6~102 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=19a9de7e668cdb3b76c3b733d0147f1853cb38a5;p=jquery-ui.git Merge branch 'master' into core-1.6.1 Conflicts: demos/menubar/default.html tests/unit/autocomplete/autocomplete.html tests/visual/effects/effects.all.html ui/jquery.ui.menu.js ui/jquery.ui.popup.js --- 19a9de7e668cdb3b76c3b733d0147f1853cb38a5 diff --cc demos/menubar/default.html index 121b12225,adee4afc9..34742bb52 --- a/demos/menubar/default.html +++ b/demos/menubar/default.html @@@ -3,8 -3,8 +3,8 @@@ jQuery UI Menubar - Default demo - + - + diff --cc demos/widget/default.html index ff85bee43,b8b012f0e..4dad912c2 --- a/demos/widget/default.html +++ b/demos/widget/default.html @@@ -4,10 -4,11 +4,11 @@@ jQuery UI Widget - Default functionality - + - + +