]> source.dussan.org Git - jquery-ui.git/commit
Merge remote branch 'origin/tooltip'
authorjzaefferer <joern.zaefferer@gmail.com>
Wed, 22 Dec 2010 17:58:57 +0000 (18:58 +0100)
committerjzaefferer <joern.zaefferer@gmail.com>
Wed, 22 Dec 2010 17:58:57 +0000 (18:58 +0100)
commit0479ab6af6414c7a8e779c3cab3e7e8406f9eb62
treecab8e0ea33ef3db131877d307a2b7c7099b7709e
parent3552947c19b8ea1b779dc9809783c6ac6a218d68
parent1fd34199efa9ddc35276b415cad8e7e37a6cc856
Merge remote branch 'origin/tooltip'

Conflicts:
demos/autocomplete/combobox.html
demos/index.html
tests/unit/index.html
14 files changed:
build/build.xml
demos/autocomplete/combobox.html
demos/index.html
demos/tooltip/custom-animation.html
demos/tooltip/default.html
demos/tooltip/delegation-mixbag.html
demos/tooltip/forms.html
demos/tooltip/tracking.html
tests/unit/index.html
tests/unit/tooltip/tooltip.html
tests/visual/compound/widgets_in_dialog.html
tests/visual/index.html
tests/visual/tooltip/tooltip.html
themes/base/jquery.ui.base.css