]> source.dussan.org Git - jquery-ui.git/commitdiff
projects / jquery-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96e78a2 83910b6)
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)
Conflicts:
tests/unit/dialog/dialog_defaults.js


Trivial merge
The official jQuery user interface library: https://github.com/jquery/jquery-ui