Jim Blake cfce2f5a5c Merge branch 'maint-rel-1.6' into develop ... Conflicts: utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/CommandRunnerException.java utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/FatalException.java utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/SeleniumRunnerParameters.java utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/datamodel/DataModel.java utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/output/OutputSummaryFormatter.java		2014-04-04 16:23:57 -04:00
..
buildutils	getting rid of problematic file	2014-04-04 15:22:13 -04:00
licenser	VIVO-4 remove the license substitution code from the license scanner	2013-08-26 14:56:54 -04:00
testContentNegotiation	Adding test for content negotiation	2013-09-27 16:03:28 -04:00
testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner	Merge branch 'maint-rel-1.6' into develop	2014-04-04 16:23:57 -04:00