Author: ltheussl
Date: Tue Jun 7 10:06:41 2011
New Revision: 1132939
URL: http://svn.apache.org/viewvc?rev=1132939&view=rev
Log:
merge r1132936 from trunk: add an index file which is not generated by pir in m3
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/site/apt/
- copied from r1132936,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/site/apt/index.apt
- copied unchanged from r1132936,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 10:06:41 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936
