]> source.dussan.org Git - jquery-ui.git/commit
Merge branch 'master' into core-1.6.1
authorScott González <scott.gonzalez@gmail.com>
Mon, 25 Jul 2011 15:53:14 +0000 (11:53 -0400)
committerScott González <scott.gonzalez@gmail.com>
Mon, 25 Jul 2011 15:53:14 +0000 (11:53 -0400)
commit19a9de7e668cdb3b76c3b733d0147f1853cb38a5
treea259b421dd77cbec27e55db9b4d1104bf5214a2a
parentdaadc343be2f139e82719e2e5ff466aa19ec166f
parent51ee3be39829e339c8e4bccb532347944e600ca5
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
19 files changed:
demos/menubar/default.html
demos/popup/default.html
demos/position/default.html
demos/widget/default.html
tests/unit/accordion/accordion.html
tests/unit/accordion/accordion_deprecated.html
tests/unit/autocomplete/autocomplete.html
tests/unit/datepicker/datepicker_options.js
tests/unit/effects/effects.html
tests/unit/position/position.html
tests/visual/effects/effects.all.html
tests/visual/position/position.html
ui/jquery.ui.accordion.js
ui/jquery.ui.datepicker.js
ui/jquery.ui.dialog.js
ui/jquery.ui.menu.js
ui/jquery.ui.menubar.js
ui/jquery.ui.popup.js
ui/jquery.ui.spinner.js