aboutsummaryrefslogtreecommitdiffstats
path: root/themes/base/jquery.ui.base.css
diff options
context:
space:
mode:
authorjzaefferer <joern.zaefferer@gmail.com>2010-12-22 18:58:57 +0100
committerjzaefferer <joern.zaefferer@gmail.com>2010-12-22 18:58:57 +0100
commit0479ab6af6414c7a8e779c3cab3e7e8406f9eb62 (patch)
treecab8e0ea33ef3db131877d307a2b7c7099b7709e /themes/base/jquery.ui.base.css
parent3552947c19b8ea1b779dc9809783c6ac6a218d68 (diff)
parent1fd34199efa9ddc35276b415cad8e7e37a6cc856 (diff)
downloadjquery-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 'themes/base/jquery.ui.base.css')
-rw-r--r--themes/base/jquery.ui.base.css1
1 files changed, 1 insertions, 0 deletions
diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css
index 34d2c8fc6..733cb755e 100644
--- a/themes/base/jquery.ui.base.css
+++ b/themes/base/jquery.ui.base.css
@@ -21,3 +21,4 @@
@import url("jquery.ui.slider.css");
@import url("jquery.ui.spinner.css");
@import url("jquery.ui.tabs.css");
+@import url("jquery.ui.tooltip.css");