Commit Graph

4 Commits

Author SHA1 Message Date
Scott González
c07ae398fa Merge branch 'master' into interactions
Conflicts:
	demos/draggable/constrain-movement.html
	demos/draggable/cursor-style.html
	demos/draggable/handle.html
	demos/draggable/index.html
	demos/draggable/revert.html
	demos/draggable/visual-feedback.html
	demos/index.html
	ui/jquery.ui.draggable.js
	ui/jquery.ui.droppable.js
2012-11-05 16:49:51 -05:00
Richard D. Worth
1359a53afb Fixed demos to track update of jQuery from 1.7.1 to 1.7.2 2012-07-06 15:19:47 -04:00
Scott González
9d7b71bc29 Interaction demos: Cleanup. 2012-01-27 21:11:22 -05:00
Richard D. Worth
2753173f40 Interaction demos: Added index and default 2012-01-26 11:11:16 -05:00