]> source.dussan.org Git - jquery-ui.git/commit
Merge branch 'master' into widget-events
authorScott González <scott.gonzalez@gmail.com>
Tue, 1 Feb 2011 03:04:09 +0000 (22:04 -0500)
committerScott González <scott.gonzalez@gmail.com>
Tue, 1 Feb 2011 03:04:09 +0000 (22:04 -0500)
commitcb8f5b7f2679ab5473229cac432f28c72521048c
tree60b63ec0b7f190832dcadef9e04a195985e61621
parentbb857ddd8d6d4ac7620b49bf765352cd064494c0
parenteffbb2c0ec2e60bea6ec5e5822ee52f8ea9e18bc
Merge branch 'master' into widget-events

Conflicts:
ui/jquery.ui.widget.js
tests/unit/widget/widget_core.js
ui/jquery.ui.accordion.js
ui/jquery.ui.widget.js