Author: bago
Date: Tue Jan 18 11:31:19 2011
New Revision: 1060322

URL: http://svn.apache.org/viewvc?rev=1060322&view=rev
Log:
modules consolidation (JAMES-1184)

Added:
    james/server/trunk/file/LICENSE.txt   (props changed)
      - copied unchanged from r1060321, james/server/trunk/user-file/LICENSE.txt
    james/server/trunk/file/NOTICE.txt   (props changed)
      - copied unchanged from r1060321, james/server/trunk/user-file/NOTICE.txt
    james/server/trunk/file/pom.xml   (props changed)
      - copied unchanged from r1060321, james/server/trunk/user-file/pom.xml
    james/server/trunk/file/src/   (props changed)
      - copied from r1060321, james/server/trunk/user-file/src/

Propchange: james/server/trunk/file/LICENSE.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:31:19 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-file/LICENSE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-file/LICENSE.txt:893986-896410

Propchange: james/server/trunk/file/NOTICE.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:31:19 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-file/NOTICE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-file/NOTICE.txt:893986-896410

Propchange: james/server/trunk/file/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:31:19 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-file/pom.xml:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-file/pom.xml:893986-896410

Propchange: james/server/trunk/file/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:31:19 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-file/src:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-file/src:893986-896410



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to