You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2010/05/14 16:04:44 UTC
svn commit: r944269 - in /uima/uimaj/branches/mavenAlign:
PearPackagingMavenPlugin/ aggregate-uimaj-eclipse-plugins/ aggregate-uimaj/
jVinci/ uima-docbook-overview-and-setup/ uima-docbook-references/
uima-docbook-tools/ uima-docbook-tutorials-and-users...
Author: schor
Date: Fri May 14 14:04:43 2010
New Revision: 944269
URL: http://svn.apache.org/viewvc?rev=944269&view=rev
Log:
[UIMA-1756] post merge back to trunk - update branch info re: merge (no files changed)
Modified:
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/ (props changed)
uima/uimaj/branches/mavenAlign/aggregate-uimaj/ (props changed)
uima/uimaj/branches/mavenAlign/aggregate-uimaj-eclipse-plugins/ (props changed)
uima/uimaj/branches/mavenAlign/jVinci/ (props changed)
uima/uimaj/branches/mavenAlign/uima-docbook-overview-and-setup/ (props changed)
uima/uimaj/branches/mavenAlign/uima-docbook-references/ (props changed)
uima/uimaj/branches/mavenAlign/uima-docbook-tools/ (props changed)
uima/uimaj/branches/mavenAlign/uima-docbook-tutorials-and-users-guides/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-adapter-soap/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-bootstrap/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-component-test-util/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-core/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-cpe/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-distr/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-document-annotation/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-ep-debug/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-examples/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-internal-tools/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-test-util/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-tools/ (props changed)
Propchange: uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin:944252
Propchange: uima/uimaj/branches/mavenAlign/aggregate-uimaj/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/aggregate-uimaj:944252
Propchange: uima/uimaj/branches/mavenAlign/aggregate-uimaj-eclipse-plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/aggregate-uimaj-eclipse-plugins:944252
Propchange: uima/uimaj/branches/mavenAlign/jVinci/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/jVinci:944252
Propchange: uima/uimaj/branches/mavenAlign/uima-docbook-overview-and-setup/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uima-docbook-overview-and-setup:944252
Propchange: uima/uimaj/branches/mavenAlign/uima-docbook-references/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uima-docbook-references:944251-944252
Propchange: uima/uimaj/branches/mavenAlign/uima-docbook-tools/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uima-docbook-tools:944252
Propchange: uima/uimaj/branches/mavenAlign/uima-docbook-tutorials-and-users-guides/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uima-docbook-tutorials-and-users-guides:944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-adapter-soap/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uimaj-adapter-soap:944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci:944251-944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-bootstrap/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uimaj-bootstrap:944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-component-test-util/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uimaj-component-test-util:944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -1 +1,2 @@
+/uima/uimaj/branches/mavenAlign/uimaj-core:944252
/uima/uimaj/trunk/uimaj-core:933273-939688
Propchange: uima/uimaj/branches/mavenAlign/uimaj-cpe/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uimaj-cpe:944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-distr/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uimaj-distr:944251-944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-document-annotation/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uimaj-document-annotation:944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime:944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools:944251-944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site:944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -1 +1,2 @@
/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor:933233
+/uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor:944251-944252
Propchange: uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator:944251-944253
Propchange: uima/uimaj/branches/mavenAlign/uimaj-ep-debug/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uimaj-ep-debug:944252-944253
Propchange: uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen:944252-944253
Propchange: uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager:944251-944254
Propchange: uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uimaj-ep-runtime:944252-944254
Propchange: uima/uimaj/branches/mavenAlign/uimaj-examples/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uimaj-examples:944252-944254
Propchange: uima/uimaj/branches/mavenAlign/uimaj-internal-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:04:43 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uimaj-internal-tools:944251-944255
Propchange: uima/uimaj/branches/mavenAlign/uimaj-test-util/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uimaj-test-util:944252-944255
Propchange: uima/uimaj/branches/mavenAlign/uimaj-tools/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uimaj-tools:944252-944255