Propchange: archiva/branches/archiva-MRM-980/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:825850-909464 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:825850-909464,960322
Propchange: archiva/branches/archiva-MRM-980/archiva-modules/plugins/repository-statistics/src/test/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test:825850-887039,887040-909464* +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test:825850-887039,887040-909464*,960322 Propchange: archiva/branches/archiva-MRM-980/archiva-modules/plugins/repository-statistics/src/test/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java:825850-887039,887040-909464* +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java:825850-887039,887040-909464*,960322 Propchange: archiva/branches/archiva-MRM-980/archiva-modules/plugins/repository-statistics/src/test/java/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org:825850-887039,887040-909464* +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org:825850-887039,887040-909464*,960322 Propchange: archiva/branches/archiva-MRM-980/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:825850-887039,887040-909464* +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:825850-887039,887040-909464*,960322 Propchange: archiva/branches/archiva-MRM-980/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:825850-887039,887040-909464* +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:825850-887039,887040-909464*,960322 Propchange: archiva/branches/archiva-MRM-980/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909464* +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909464*,960322 Propchange: archiva/branches/archiva-MRM-980/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464* +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*,960322 Propchange: archiva/branches/archiva-MRM-980/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464* +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464*,960322 Propchange: archiva/branches/archiva-MRM-980/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-909464 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-909464,960322 Propchange: archiva/branches/archiva-MRM-980/skin/src/main/resources/META-INF/maven/site.vm ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -1 +1 @@ -/archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm:899478-909464 +/archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm:899478-909464,960322 Propchange: archiva/branches/archiva-MRM-980/skin/src/main/resources/css/maven-base.css ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -1 +1 @@ -/archiva/trunk/skin/src/main/resources/css/maven-base.css:899478-909464 +/archiva/trunk/skin/src/main/resources/css/maven-base.css:899478-909464,960322 Propchange: archiva/branches/archiva-MRM-980/skin/src/main/resources/css/print.css ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -1 +1 @@ -/archiva/trunk/skin/src/main/resources/css/print.css:899478-909464 +/archiva/trunk/skin/src/main/resources/css/print.css:899478-909464,960322 Propchange: archiva/branches/archiva-MRM-980/skin/src/main/resources/images/logos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 02:33:18 2010 @@ -1 +1 @@ -/archiva/trunk/skin/src/main/resources/images/logos:899478-909464 +/archiva/trunk/skin/src/main/resources/images/logos:899478-909464,960322
