]> source.dussan.org Git - jquery-ui.git/commit
Merge branch 'master' of github.com:jquery/jquery-ui
authorScott González <scott.gonzalez@gmail.com>
Wed, 14 Jul 2010 20:45:54 +0000 (16:45 -0400)
committerScott González <scott.gonzalez@gmail.com>
Wed, 14 Jul 2010 20:45:54 +0000 (16:45 -0400)
commit6b36499c71991eb6a5a3aab14d2401e1e9ca2f2c
tree244ff1c7e0f338cd6233b078f29af05d7efadce5
parent96e78a2cb7968fead62cfebd7640d3b96246f8dd
parent83910b6bd3db241b1f7dc6fbfa070954be989bc7
Merge branch 'master' of github.com:jquery/jquery-ui

Conflicts:
tests/unit/dialog/dialog_defaults.js