More web.xml / fragment merge code
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Sat, 7 Nov 2009 00:46:50 +0000 (00:46 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Sat, 7 Nov 2009 00:46:50 +0000 (00:46 +0000)
commit9f2096626252b44b1ea2916d6b97718a6c71279c
tree5640af03ed4676e08e65e3551f802a4de2e26a9e
parent87b2cf05e83199e9289fe26d6914768f220b1089
More web.xml / fragment merge code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@833619 13f79535-47bb-0310-9956-ffa450edef68
java/org/apache/catalina/startup/LocalStrings.properties
java/org/apache/catalina/startup/WebXml.java