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 2016/09/01 18:44:46 UTC

svn commit: r1758834 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties

Author: schor
Date: Thu Sep  1 18:44:46 2016
New Revision: 1758834

URL: http://svn.apache.org/viewvc?rev=1758834&view=rev
Log:
no Jira - merge catchup of anything left behind.  

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties   (props changed)

Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep  1 18:44:46 2016
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties:1690273-1758833