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 17:44:04 UTC
svn commit: r944322 - in /uima/uimaj/trunk: aggregate-uimaj-eclipse-plugins/
aggregate-uimaj/ uima-docbook-overview-and-setup/ uima-docbook-references/
uima-docbook-tools/ uima-docbook-tutorials-and-users-guides/
Author: schor
Date: Fri May 14 15:44:04 2010
New Revision: 944322
URL: http://svn.apache.org/viewvc?rev=944322&view=rev
Log:
[UIMA-1756] merge new files in branch into trunk for uimaj - the docbook files, and the new aggregate-xxx files
Added:
uima/uimaj/trunk/aggregate-uimaj/ (props changed)
- copied from r944321, uima/uimaj/branches/mavenAlign/aggregate-uimaj/
uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/ (props changed)
- copied from r944321, uima/uimaj/branches/mavenAlign/aggregate-uimaj-eclipse-plugins/
uima/uimaj/trunk/uima-docbook-overview-and-setup/ (props changed)
- copied from r944321, uima/uimaj/branches/mavenAlign/uima-docbook-overview-and-setup/
uima/uimaj/trunk/uima-docbook-references/ (props changed)
- copied from r944321, uima/uimaj/branches/mavenAlign/uima-docbook-references/
uima/uimaj/trunk/uima-docbook-tools/ (props changed)
- copied from r944321, uima/uimaj/branches/mavenAlign/uima-docbook-tools/
uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides/ (props changed)
- copied from r944321, uima/uimaj/branches/mavenAlign/uima-docbook-tutorials-and-users-guides/
Propchange: uima/uimaj/trunk/aggregate-uimaj/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 14 15:44:04 2010
@@ -0,0 +1,2 @@
+target
+.project
Propchange: uima/uimaj/trunk/aggregate-uimaj/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/aggregate-uimaj:944252
Propchange: uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 14 15:44:04 2010
@@ -0,0 +1,2 @@
+target
+.project
Propchange: uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 15:44:04 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/aggregate-uimaj-eclipse-plugins:944252
Propchange: uima/uimaj/trunk/uima-docbook-overview-and-setup/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 14 15:44:04 2010
@@ -0,0 +1,3 @@
+target
+.project
+.settings
Propchange: uima/uimaj/trunk/uima-docbook-overview-and-setup/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 15:44:04 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uima-docbook-overview-and-setup:944252
Propchange: uima/uimaj/trunk/uima-docbook-references/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 14 15:44:04 2010
@@ -0,0 +1,3 @@
+target
+.project
+.settings
Propchange: uima/uimaj/trunk/uima-docbook-references/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 15:44:04 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uima-docbook-references:944251-944252
Propchange: uima/uimaj/trunk/uima-docbook-tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 14 15:44:04 2010
@@ -0,0 +1,3 @@
+target
+.project
+.settings
Propchange: uima/uimaj/trunk/uima-docbook-tools/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/branches/mavenAlign/uima-docbook-tools:944252
Propchange: uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 14 15:44:04 2010
@@ -0,0 +1,3 @@
+target
+.project
+.settings
Propchange: uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 15:44:04 2010
@@ -0,0 +1 @@
+/uima/uimaj/branches/mavenAlign/uima-docbook-tutorials-and-users-guides:944252