Author: schor
Date: Thu Jul 8 12:31:17 2010
New Revision: 961735
URL: http://svn.apache.org/viewvc?rev=961735&view=rev
Log:
[UIMA-1832] merge trunk -> branch (no changes except for recording merge info)
Modified:
uima/build/branches/depend-on-parent-pom-4/aggregate-parent-poms/ (props
changed)
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-annotator/
(props changed)
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-distr/
(props changed)
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-docbook/
(props changed)
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-eclipse-plugins/
(props changed)
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-eclipse-plugins-ibm-notice/
(props changed)
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-ibm-notice/
(props changed)
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-single-project/
(props changed)
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-top/
(props changed)
uima/build/branches/depend-on-parent-pom-4/uima-assembly-single-project/
(props changed)
uima/build/branches/depend-on-parent-pom-4/uima-build-helper-maven-plugin/
(props changed)
uima/build/branches/depend-on-parent-pom-4/uima-docbook-olink/ (props
changed)
uima/build/branches/depend-on-parent-pom-4/uima-docbook-resource-bundle/
(props changed)
uima/build/branches/depend-on-parent-pom-4/uima-jar-resource-bundle/
(props changed)
Propchange: uima/build/branches/depend-on-parent-pom-4/aggregate-parent-poms/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/build/trunk/aggregate-parent-poms:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-annotator/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:31:17 2010
@@ -0,0 +1 @@
+/uima/build/trunk/parent-poms/parent-pom-annotator:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-distr/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/build/trunk/parent-poms/parent-pom-distr:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-docbook/
------------------------------------------------------------------------------
svn:mergeinfo =
/uima/build/trunk/parent-poms/parent-pom-docbook:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-eclipse-plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:31:17 2010
@@ -0,0 +1 @@
+/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-eclipse-plugins-ibm-notice/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:31:17 2010
@@ -0,0 +1 @@
+/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-ibm-notice/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:31:17 2010
@@ -0,0 +1 @@
+/uima/build/trunk/parent-poms/parent-pom-ibm-notice:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-single-project/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:31:17 2010
@@ -0,0 +1 @@
+/uima/build/trunk/parent-poms/parent-pom-single-project:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-top/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/build/trunk/parent-poms/parent-pom-top:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/uima-assembly-single-project/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/build/trunk/uima-assembly-single-project:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/uima-build-helper-maven-plugin/
------------------------------------------------------------------------------
svn:mergeinfo =
/uima/build/trunk/uima-build-helper-maven-plugin:961327-961732
Propchange: uima/build/branches/depend-on-parent-pom-4/uima-docbook-olink/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/build/trunk/uima-docbook-olink:961327-961732
Propchange:
uima/build/branches/depend-on-parent-pom-4/uima-docbook-resource-bundle/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/build/trunk/uima-docbook-resource-bundle:961327-961732
Propchange: uima/build/branches/depend-on-parent-pom-4/uima-jar-resource-bundle/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/build/trunk/uima-jar-resource-bundle:961327-961732
