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:03:59 UTC
svn commit: r944268 - in /uima/uima-as/branches/mavenAlign: uima-as-distr/
uima-as-docbooks/ uimaj-as-activemq/ uimaj-as-camel/ uimaj-as-core/
uimaj-as-core/src/main/java/org/apache/uima/aae/message/ uimaj-as-jms/
uimaj-as-osgi-runtime/ uimaj-eclipse-f...
Author: schor
Date: Fri May 14 14:03:59 2010
New Revision: 944268
URL: http://svn.apache.org/viewvc?rev=944268&view=rev
Log:
[UIMA-1756] post merge back to trunk - update branch info re: merge (no files changed)
Modified:
uima/uima-as/branches/mavenAlign/uima-as-distr/ (props changed)
uima/uima-as/branches/mavenAlign/uima-as-docbooks/ (props changed)
uima/uima-as/branches/mavenAlign/uimaj-as-activemq/ (props changed)
uima/uima-as/branches/mavenAlign/uimaj-as-camel/ (props changed)
uima/uima-as/branches/mavenAlign/uimaj-as-core/ (props changed)
uima/uima-as/branches/mavenAlign/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java (props changed)
uima/uima-as/branches/mavenAlign/uimaj-as-jms/ (props changed)
uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime/ (props changed)
uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/ (props changed)
uima/uima-as/branches/mavenAlign/uimaj-ep-deployeditor/ (props changed)
uima/uima-as/branches/mavenAlign/uimaj-ep-runtime-deployeditor/ (props changed)
Propchange: uima/uima-as/branches/mavenAlign/uima-as-distr/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uima-as/trunk/uima-as-distr:941450-944262
Propchange: uima/uima-as/branches/mavenAlign/uima-as-docbooks/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uima-as/trunk/uima-as-docbooks:941450-944262
Propchange: uima/uima-as/branches/mavenAlign/uimaj-as-activemq/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 14 14:03:59 2010
@@ -1 +1 @@
-/uima/uima-as/trunk/uimaj-as-activemq:943952-943956
+/uima/uima-as/trunk/uimaj-as-activemq:941450-944262
Propchange: uima/uima-as/branches/mavenAlign/uimaj-as-camel/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uima-as/trunk/uimaj-as-camel:941450-944262
Propchange: uima/uima-as/branches/mavenAlign/uimaj-as-core/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uima-as/trunk/uimaj-as-core:941450-944262
Propchange: uima/uima-as/branches/mavenAlign/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java
('svn:mergeinfo' removed)
Propchange: uima/uima-as/branches/mavenAlign/uimaj-as-jms/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 14 14:03:59 2010
@@ -1 +1 @@
-/uima/uima-as/trunk/uimaj-as-jms:943952-943956
+/uima/uima-as/trunk/uimaj-as-jms:941450-944262
Propchange: uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uima-as/trunk/uimaj-as-osgi-runtime:941450-944262
Propchange: uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:03:59 2010
@@ -0,0 +1 @@
+/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor:941450-944262
Propchange: uima/uima-as/branches/mavenAlign/uimaj-ep-deployeditor/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uima-as/trunk/uimaj-ep-deployeditor:941450-944262
Propchange: uima/uima-as/branches/mavenAlign/uimaj-ep-runtime-deployeditor/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 14:03:59 2010
@@ -0,0 +1 @@
+/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor:941450-944262