]> source.dussan.org Git - jquery-ui.git/commit
Merge remote branch 'origin/menu'
authorjzaefferer <joern.zaefferer@gmail.com>
Wed, 22 Dec 2010 17:31:27 +0000 (18:31 +0100)
committerjzaefferer <joern.zaefferer@gmail.com>
Wed, 22 Dec 2010 17:31:27 +0000 (18:31 +0100)
commit3552947c19b8ea1b779dc9809783c6ac6a218d68
tree61b23078b9ff83f65bd5258bc4dd9efed5ac5f7a
parent8d39171fa285519203688084f3cf66c1e2ae0ada
parent70e8e9f294729f120f7b52fb9803fddfd37e464e
Merge remote branch 'origin/menu'

Conflicts:
demos/autocomplete/categories.html
demos/autocomplete/combobox.html
demos/autocomplete/custom-data.html
demos/autocomplete/default.html
demos/autocomplete/folding.html
demos/autocomplete/multiple-remote.html
demos/autocomplete/multiple.html
demos/autocomplete/remote-jsonp.html
demos/autocomplete/remote-with-cache.html
demos/autocomplete/remote.html
demos/autocomplete/xml.html
demos/button/splitbutton.html
demos/index.html
tests/visual/menu/nested.html
themes/base/jquery.ui.autocomplete.css
ui/jquery.ui.autocomplete.js
27 files changed:
demos/autocomplete/categories.html
demos/autocomplete/combobox.html
demos/autocomplete/custom-data.html
demos/autocomplete/default.html
demos/autocomplete/folding.html
demos/autocomplete/multiple-remote.html
demos/autocomplete/multiple.html
demos/autocomplete/remote-jsonp.html
demos/autocomplete/remote-with-cache.html
demos/autocomplete/remote.html
demos/autocomplete/xml.html
demos/button/splitbutton.html
demos/index.html
tests/static/index.html
tests/unit/index.html
tests/visual/all.html
tests/visual/autocomplete/autocomplete.html
tests/visual/compound/widgets_in_dialog.html
tests/visual/index.html
tests/visual/menu/contextmenu.html
tests/visual/menu/drilldown.html
tests/visual/menu/menu.html
tests/visual/menu/nested.html
tests/visual/position/position.html
themes/base/jquery.ui.autocomplete.css
themes/base/jquery.ui.base.css
ui/jquery.ui.autocomplete.js