Revision 6567

Jump to revision:
Author:	gage
Date:	Thu Nov 25 19:35:45 2010 UTC (2 years, 5 months ago)
Log Message:	merge with trunk

Changed paths:

Path	Details
branches/gage_dev/webwork2/htdocs/applets/ (Copied from trunk/webwork2/htdocs/applets, r6565)	added
branches/gage_dev/webwork2/htdocs/applets/Image_and_Cursor_All/ (Copied from trunk/webwork2/htdocs/applets/Image_and_Cursor_All, r6565)	replaced
branches/gage_dev/webwork2/htdocs/applets/README (Copied from trunk/webwork2/htdocs/applets/README, r6565)	replaced
branches/gage_dev/webwork2/htdocs/applets/geogebra_stable/ (Copied from trunk/webwork2/htdocs/applets/geogebra_stable, r6565)	replaced
branches/gage_dev/webwork2/htdocs/applets/geogebra_stable/geogebra/ (Copied from trunk/webwork2/htdocs/applets/geogebra_stable/geogebra, r6565)	replaced
branches/gage_dev/webwork2/htdocs/applets/geogebra_stable/geogebra/properties/ (Copied from trunk/webwork2/htdocs/applets/geogebra_stable/geogebra/properties, r6565)	replaced
branches/gage_dev/webwork2/htdocs/applets/source/ (Copied from trunk/webwork2/htdocs/applets/source, r6565)	replaced
branches/gage_dev/webwork2/htdocs/applets/xFunctions/ (Copied from trunk/webwork2/htdocs/applets/xFunctions, r6565)	replaced