Author: brett
Date: Tue Feb 23 05:37:32 2010
New Revision: 915192
URL: http://svn.apache.org/viewvc?rev=915192&view=rev
Log:
replace trunk
Added:
archiva/trunk/ (props changed)
- copied from r915191, archiva/branches/MRM-1025/
Removed:
archiva/branches/MRM-1025/
Propchange: archiva/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 23 05:37:32 2010
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.metadata
+.settings
+.classpath
+.project
+.pom.xml.swp
Propchange: archiva/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 23 05:37:32 2010
@@ -0,0 +1,6 @@
+/archiva/branches/MRM-1025:721945-723577
+/archiva/branches/MRM-541:686983-687034
+/archiva/branches/archiva-search-improvements:723609-726925
+/archiva/branches/archiva-struts2:699795-705848
+/archiva/tags/archiva-1.3:898632
+/archiva/trunk:825850-909464
