aboutsummaryrefslogtreecommitdiffstats
path: root/tests/static
diff options
context:
space:
mode:
authorjzaefferer <joern.zaefferer@gmail.com>2010-12-22 18:31:27 +0100
committerjzaefferer <joern.zaefferer@gmail.com>2010-12-22 18:31:27 +0100
commit3552947c19b8ea1b779dc9809783c6ac6a218d68 (patch)
tree61b23078b9ff83f65bd5258bc4dd9efed5ac5f7a /tests/static
parent8d39171fa285519203688084f3cf66c1e2ae0ada (diff)
parent70e8e9f294729f120f7b52fb9803fddfd37e464e (diff)
downloadjquery-ui-3552947c19b8ea1b779dc9809783c6ac6a218d68.tar.gz
jquery-ui-3552947c19b8ea1b779dc9809783c6ac6a218d68.zip
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
Diffstat (limited to 'tests/static')
-rw-r--r--tests/static/index.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/static/index.html b/tests/static/index.html
index 80048bf42..3145ad219 100644
--- a/tests/static/index.html
+++ b/tests/static/index.html
@@ -32,6 +32,8 @@
<li><a href="button/default.html">Button</a></li>
<li><a href="datepicker/default.html">Datepicker</a></li>
<li><a href="dialog/default.html">Dialog</a></li>
+ <li><a href="menu/default.html">Menu</a></li>
+ <li><a href="menu/all-menus-icons.html">Menu with icons</a></li>
<li><a href="progressbar/default.html">Progressbar</a></li>
<li><a href="slider/default.html">Slider</a></li>
<li><a href="tabs/default.html">Tabs</a></li>