You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ra...@apache.org on 2011/02/21 19:13:06 UTC
svn commit: r1073101 - in /lenya/branches/BRANCH_2_1_X: ./ src/
src/modules-core/linking/ src/modules/notification/
Author: rainer
Date: Mon Feb 21 18:13:06 2011
New Revision: 1073101
URL: http://svn.apache.org/viewvc?rev=1073101&view=rev
Log:
Add mergeinfo from 2.0.4.
Modified:
lenya/branches/BRANCH_2_1_X/ (props changed)
lenya/branches/BRANCH_2_1_X/src/ (props changed)
lenya/branches/BRANCH_2_1_X/src/modules-core/linking/ (props changed)
lenya/branches/BRANCH_2_1_X/src/modules/notification/ (props changed)
Propchange: lenya/branches/BRANCH_2_1_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 21 18:13:06 2011
@@ -0,0 +1,2 @@
+/lenya/branches/BRANCH_2_0_X:1057309
+/lenya/tags/RELEASE_2_0_4:1067488-1070690
Propchange: lenya/branches/BRANCH_2_1_X/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 21 18:13:06 2011
@@ -0,0 +1,2 @@
+/lenya/branches/BRANCH_2_0_X/src:1049475,1052369,1057309
+/lenya/tags/RELEASE_2_0_4/src:1067488-1070690
Propchange: lenya/branches/BRANCH_2_1_X/src/modules-core/linking/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 21 18:13:06 2011
@@ -1 +1,2 @@
-/lenya/branches/BRANCH_2_0_X/src/modules-core/linking:1052370
+/lenya/branches/BRANCH_2_0_X/src/modules-core/linking:1049475,1052369-1052370,1057309
+/lenya/tags/RELEASE_2_0_4/src/modules-core/linking:1067488-1070690
Propchange: lenya/branches/BRANCH_2_1_X/src/modules/notification/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 21 18:13:06 2011
@@ -1 +1,2 @@
-/lenya/branches/BRANCH_2_0_X/src/modules/notification:1052383
+/lenya/branches/BRANCH_2_0_X/src/modules/notification:1049475,1052369,1052383,1057309
+/lenya/tags/RELEASE_2_0_4/src/modules/notification:1067488-1070690
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org