diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-22 18:58:57 +0100 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-22 18:58:57 +0100 |
| commit | 0479ab6af6414c7a8e779c3cab3e7e8406f9eb62 (patch) | |
| tree | cab8e0ea33ef3db131877d307a2b7c7099b7709e /build | |
| parent | 3552947c19b8ea1b779dc9809783c6ac6a218d68 (diff) | |
| parent | 1fd34199efa9ddc35276b415cad8e7e37a6cc856 (diff) | |
| download | jquery-ui-0479ab6af6414c7a8e779c3cab3e7e8406f9eb62.tar.gz jquery-ui-0479ab6af6414c7a8e779c3cab3e7e8406f9eb62.zip | |
Merge remote branch 'origin/tooltip'
Conflicts:
demos/autocomplete/combobox.html
demos/index.html
tests/unit/index.html
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/build.xml b/build/build.xml index 568cc9c92..4ebe6984c 100644 --- a/build/build.xml +++ b/build/build.xml @@ -271,6 +271,7 @@ <get src="${url}Dialog" dest="${docs.dir}dialog.html" /> <get src="${url}Progressbar" dest="${docs.dir}progressbar.html" /> <get src="${url}Slider" dest="${docs.dir}slider.html" /> + <get src="${url}Tooltip" dest="${docs.dir}tooltip.html" /> <get src="${url}Tabs" dest="${docs.dir}tabs.html" /> <get src="${url}Position" dest="${docs.dir}position.html" /> |