Author: veithen
Date: Fri Jun 10 21:36:48 2011
New Revision: 1134448
URL: http://svn.apache.org/viewvc?rev=1134448&view=rev
Log:
Merged r1134446 to the 1.6 branch.
Added:
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/
- copied from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.1/
- copied from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.1/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.1/download.cgi
- copied unchanged from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.1/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.2/
- copied from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.2/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.2/download.cgi
- copied unchanged from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.2/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.3/
- copied from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.3/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.3/download.cgi
- copied unchanged from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.3/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.4/
- copied from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.4/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.4/download.cgi
- copied unchanged from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.4/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.5/
- copied from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.5/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.5.1/
- copied from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.5.1/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.5.1/download.cgi
- copied unchanged from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.5.1/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.5/download.cgi
- copied unchanged from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.5/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.6.0/
- copied from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.6.0/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.6.0/download.cgi
- copied unchanged from r1134446,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.6.0/download.cgi
Removed:
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.1/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.2/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.3/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.4/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5/download.cgi
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.cgi
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 10 21:36:48 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564,1134446
