Revision 6740

Jump to revision:
Author:	gage
Date:	Sat Mar 19 02:24:34 2011 UTC (2 years, 2 months ago)
Log Message:	merging with dg

Changed paths:

Path	Details
branches/gage_dev/webwork2/	modified , props changed
branches/gage_dev/webwork2/htdocs/css/setmaker2.css	modified , text changed
branches/gage_dev/webwork2/htdocs/js/dnd.js	modified , text changed
branches/gage_dev/webwork2/htdocs/js/form_builder.js	modified , text changed
branches/gage_dev/webwork2/htdocs/js/problem_grid.js	modified , text changed
branches/gage_dev/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker2.pm	modified , text changed