jquery-ui/demos/interaction
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
..
box.html Merge branch 'master' into interactions 2012-11-05 16:49:51 -05:00
default.html Merge branch 'master' into interactions 2012-11-05 16:49:51 -05:00
index.html Interaction demos: Added box demo 2012-01-26 14:04:01 -05:00