Skip to content
Permalink
Browse files

Merge branch 'master' into grunt

  • Loading branch information
scottgonzalez committed Mar 14, 2012
2 parents ee64f89 + ec062c1 commit 2e0fd83070a800f1bba036b213a4ba5eb15652ac
Showing with 384 additions and 281 deletions.
  1. +1 −1 MIT-LICENSE.txt
  2. +1 −1 external/qunit.css
  3. +242 −215 external/qunit.js
  4. +1 −1 tests/jquery.simulate.js
  5. +72 −0 tests/unit/all-active.html
  6. +1 −0 tests/unit/tabs/tabs_core.js
  7. +1 −0 tests/unit/tooltip/tooltip_core.js
  8. +1 −1 themes/base/jquery.ui.accordion.css
  9. +1 −1 themes/base/jquery.ui.all.css
  10. +1 −1 themes/base/jquery.ui.autocomplete.css
  11. +1 −1 themes/base/jquery.ui.base.css
  12. +1 −1 themes/base/jquery.ui.button.css
  13. +1 −1 themes/base/jquery.ui.core.css
  14. +1 −1 themes/base/jquery.ui.datepicker.css
  15. +1 −1 themes/base/jquery.ui.dialog.css
  16. +1 −1 themes/base/jquery.ui.menu.css
  17. +1 −1 themes/base/jquery.ui.progressbar.css
  18. +1 −1 themes/base/jquery.ui.resizable.css
  19. +1 −1 themes/base/jquery.ui.selectable.css
  20. +1 −1 themes/base/jquery.ui.slider.css
  21. +1 −1 themes/base/jquery.ui.spinner.css
  22. +1 −1 themes/base/jquery.ui.tabs.css
  23. +1 −1 themes/base/jquery.ui.theme.css
  24. +1 −1 themes/base/jquery.ui.tooltip.css
  25. +1 −1 ui/jquery.effects.blind.js
  26. +1 −1 ui/jquery.effects.bounce.js
  27. +1 −1 ui/jquery.effects.clip.js
  28. +1 −1 ui/jquery.effects.core.js
  29. +1 −1 ui/jquery.effects.drop.js
  30. +1 −1 ui/jquery.effects.explode.js
  31. +1 −1 ui/jquery.effects.fade.js
  32. +1 −1 ui/jquery.effects.fold.js
  33. +1 −1 ui/jquery.effects.highlight.js
  34. +1 −1 ui/jquery.effects.pulsate.js
  35. +1 −1 ui/jquery.effects.scale.js
  36. +1 −1 ui/jquery.effects.shake.js
  37. +1 −1 ui/jquery.effects.slide.js
  38. +1 −1 ui/jquery.effects.transfer.js
  39. +15 −13 ui/jquery.ui.accordion.js
  40. +1 −1 ui/jquery.ui.autocomplete.js
  41. +1 −1 ui/jquery.ui.button.js
  42. +1 −1 ui/jquery.ui.core.js
  43. +1 −1 ui/jquery.ui.datepicker.js
  44. +1 −1 ui/jquery.ui.dialog.js
  45. +1 −1 ui/jquery.ui.draggable.js
  46. +1 −1 ui/jquery.ui.droppable.js
  47. +1 −1 ui/jquery.ui.menu.js
  48. +1 −1 ui/jquery.ui.mouse.js
  49. +1 −1 ui/jquery.ui.position.js
  50. +1 −1 ui/jquery.ui.progressbar.js
  51. +1 −1 ui/jquery.ui.resizable.js
  52. +1 −1 ui/jquery.ui.selectable.js
  53. +1 −1 ui/jquery.ui.slider.js
  54. +1 −1 ui/jquery.ui.sortable.js
  55. +1 −1 ui/jquery.ui.spinner.js
  56. +1 −1 ui/jquery.ui.tabs.js
  57. +1 −1 ui/jquery.ui.tooltip.js
  58. +1 −1 ui/jquery.ui.widget.js
@@ -1,4 +1,4 @@
Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/
Copyright (c) 2012 Paul Bakaus, http://jqueryui.com/

This software consists of voluntary contributions made by many
individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
@@ -1,5 +1,5 @@
/**
* QUnit v1.4.0pre - A JavaScript Unit Testing Framework
* QUnit v1.4.0 - A JavaScript Unit Testing Framework
*
* http://docs.jquery.com/QUnit
*

0 comments on commit 2e0fd83

Please sign in to comment.
You can’t perform that action at this time.