/[Apache-SVN]
ViewVC logotype

Revision 981149

Jump to revision: Previous Next
Author: oching
Date: Sun Aug 1 04:39:49 2010 UTC (13 years, 8 months ago)
Changed paths: 7
Log Message: 
[MRM-980] move merge jsps inside admin dir

Changed paths

Path Details
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml modified , text changed
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeAction.jsp
(Copied from archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeAction.jsp, r981144) 		added
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeExcludeConflicts.jsp
(Copied from archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp, r981144) 		added
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeResults.jsp
(Copied from archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeActionResults.jsp, r981144) 		added
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeAction.jsp deleted
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeActionResults.jsp deleted
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp deleted
infrastructure at apache.org
 ViewVC Help
Powered by ViewVC 1.1.26