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 /demos/index.html | |
| 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 'demos/index.html')
| -rw-r--r-- | demos/index.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/demos/index.html b/demos/index.html index 298803d2f..c249ef1be 100644 --- a/demos/index.html +++ b/demos/index.html @@ -28,6 +28,7 @@ <script src="../ui/jquery.ui.sortable.js"></script> <script src="../ui/jquery.ui.spinner.js"></script> <script src="../ui/jquery.ui.tabs.js"></script> + <script src="../ui/jquery.ui.tooltip.js"></script> <script src="../ui/jquery.effects.core.js"></script> <script src="../ui/jquery.effects.blind.js"></script> <script src="../ui/jquery.effects.bounce.js"></script> @@ -276,6 +277,7 @@ <dd><a href="slider/index.html">Slider</a></dd> <dd><a href="spinner/index.html">Spinner</a></dd> <dd><a href="tabs/index.html">Tabs</a></dd> + <dd><a href="tooltip/index.html">Tooltip</a></dd> <dt>Effects</dt> <dd><a href="animate/index.html">Color Animation</a></dd> <dd><a href="toggleClass/index.html">Toggle Class</a></dd> |