Author: jvanzyl
Date: Wed Oct 1 06:42:42 2008
New Revision: 700766
URL: http://svn.apache.org/viewvc?rev=700766&view=rev
Log:
o integrating mercury into trunk
Added:
maven/components/branches/maven-3.0.x-MNG-3778/ (props changed)
- copied from r700765, maven/components/trunk/
Propchange: maven/components/branches/maven-3.0.x-MNG-3778/
------------------------------------------------------------------------------
bugtraq:append = true
Propchange: maven/components/branches/maven-3.0.x-MNG-3778/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/maven-3.0.x-MNG-3778/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/maven-3.0.x-MNG-3778/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/maven-3.0.x-MNG-3778/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/components/branches/maven-3.0.x-MNG-3778/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Oct 1 06:42:42 2008
@@ -0,0 +1,19 @@
+release.properties
+deleteme.version.properties
+bootstrap
+maven.log
+target
+.classpath
+.project
+bootstrap.repo
+maven-component.i*
+.settings
+mboot.jar
+dummy
+build.ajproperties
+.generated.lst
+*.iml
+*.iws
+*.ipr
+log.txt
+setup_env.sh
Propchange: maven/components/branches/maven-3.0.x-MNG-3778/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 1 06:42:42 2008
@@ -0,0 +1,3 @@
+/maven/components/branches/maven-2.0.10-RC:680477
+/maven/components/branches/maven-2.0.x:679206
+/maven/components/trunk:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-MNG-3778/
------------------------------------------------------------------------------
svnmerge-integrated = /maven/components/branches/maven-2.0.x:1-496200
